You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/02/17 18:36:05 UTC
[01/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Repository: hbase-site
Updated Branches:
refs/heads/asf-site 6a178a983 -> ee77a3b9c
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
index eed4399..c73bb3d 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
@@ -36,27 +36,27 @@
<a class="jxr_linenumber" name="26" href="#26">26</a>
<a class="jxr_linenumber" name="27" href="#27">27</a> {
<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html">HRegionServer</a> regionServer;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String bcv;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String bcn;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String bcv;
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String bcn;
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData p_implData)
<a class="jxr_linenumber" name="34" href="#34">34</a> {
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
<a class="jxr_linenumber" name="36" href="#36">36</a> {
-<a class="jxr_linenumber" name="37" href="#37">37</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
+<a class="jxr_linenumber" name="37" href="#37">37</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
<a class="jxr_linenumber" name="38" href="#38">38</a> }
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">if</strong>(! p_implData.getBcv__IsNotDefault())
<a class="jxr_linenumber" name="40" href="#40">40</a> {
-<a class="jxr_linenumber" name="41" href="#41">41</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
+<a class="jxr_linenumber" name="41" href="#41">41</a> p_implData.setBcv(<span class="jxr_string">""</span>);
<a class="jxr_linenumber" name="42" href="#42">42</a> }
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">if</strong>(! p_implData.getBcv__IsNotDefault())
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">if</strong>(! p_implData.getBcn__IsNotDefault())
<a class="jxr_linenumber" name="44" href="#44">44</a> {
-<a class="jxr_linenumber" name="45" href="#45">45</a> p_implData.setBcv(<span class="jxr_string">""</span>);
+<a class="jxr_linenumber" name="45" href="#45">45</a> p_implData.setBcn(<span class="jxr_string">""</span>);
<a class="jxr_linenumber" name="46" href="#46">46</a> }
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">if</strong>(! p_implData.getBcn__IsNotDefault())
+<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
<a class="jxr_linenumber" name="48" href="#48">48</a> {
-<a class="jxr_linenumber" name="49" href="#49">49</a> p_implData.setBcn(<span class="jxr_string">""</span>);
+<a class="jxr_linenumber" name="49" href="#49">49</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
<a class="jxr_linenumber" name="50" href="#50">50</a> }
<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">return</strong> p_implData;
<a class="jxr_linenumber" name="52" href="#52">52</a> }
@@ -64,10 +64,10 @@
<a class="jxr_linenumber" name="54" href="#54">54</a> {
<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">super</strong>(p_templateManager, __jamon_setOptionalArguments(p_implData));
<a class="jxr_linenumber" name="56" href="#56">56</a> regionServer = p_implData.getRegionServer();
-<a class="jxr_linenumber" name="57" href="#57">57</a> format = p_implData.getFormat();
-<a class="jxr_linenumber" name="58" href="#58">58</a> filter = p_implData.getFilter();
-<a class="jxr_linenumber" name="59" href="#59">59</a> bcv = p_implData.getBcv();
-<a class="jxr_linenumber" name="60" href="#60">60</a> bcn = p_implData.getBcn();
+<a class="jxr_linenumber" name="57" href="#57">57</a> filter = p_implData.getFilter();
+<a class="jxr_linenumber" name="58" href="#58">58</a> bcv = p_implData.getBcv();
+<a class="jxr_linenumber" name="59" href="#59">59</a> bcn = p_implData.getBcn();
+<a class="jxr_linenumber" name="60" href="#60">60</a> format = p_implData.getFormat();
<a class="jxr_linenumber" name="61" href="#61">61</a> }
<a class="jxr_linenumber" name="62" href="#62">62</a>
<a class="jxr_linenumber" name="63" href="#63">63</a> @Override <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
@@ -96,8 +96,8 @@
<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_comment">// 41, 3</em>
<a class="jxr_linenumber" name="87" href="#87">87</a> {
<a class="jxr_linenumber" name="88" href="#88">88</a> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl __jamon__<strong class="jxr_keyword">var</strong>_1 = <strong class="jxr_keyword">new</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl(<strong class="jxr_keyword">this</strong>.getTemplateManager());
-<a class="jxr_linenumber" name="89" href="#89">89</a> __jamon__<strong class="jxr_keyword">var</strong>_1.setFormat(<span class="jxr_string">"json"</span> );
-<a class="jxr_linenumber" name="90" href="#90">90</a> __jamon__<strong class="jxr_keyword">var</strong>_1.setFilter(filter);
+<a class="jxr_linenumber" name="89" href="#89">89</a> __jamon__<strong class="jxr_keyword">var</strong>_1.setFilter(filter);
+<a class="jxr_linenumber" name="90" href="#90">90</a> __jamon__<strong class="jxr_keyword">var</strong>_1.setFormat(<span class="jxr_string">"json"</span> );
<a class="jxr_linenumber" name="91" href="#91">91</a> __jamon__<strong class="jxr_keyword">var</strong>_1.renderNoFlush(jamonWriter);
<a class="jxr_linenumber" name="92" href="#92">92</a> }
<a class="jxr_linenumber" name="93" href="#93">93</a> <em class="jxr_comment">// 41, 68</em>
[18/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
Published site at 9f8273e7175954cf6dd4bf523b531bf9971749bb.
Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/ee77a3b9
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/ee77a3b9
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/ee77a3b9
Branch: refs/heads/asf-site
Commit: ee77a3b9c46c98251f888c3762b8fa737fd48ccf
Parents: 6a178a9
Author: jenkins <bu...@apache.org>
Authored: Wed Feb 17 15:07:08 2016 +0000
Committer: Misty Stanley-Jones <ms...@cloudera.com>
Committed: Wed Feb 17 09:34:05 2016 -0800
----------------------------------------------------------------------
acid-semantics.html | 4 +-
apache_hbase_reference_guide.pdf | 4 +-
apache_hbase_reference_guide.pdfmarks | 4 +-
book.html | 2 +-
bulk-loads.html | 4 +-
checkstyle-aggregate.html | 10 +-
coc.html | 4 +-
cygwin.html | 4 +-
dependencies.html | 4 +-
dependency-convergence.html | 4 +-
dependency-info.html | 4 +-
dependency-management.html | 4 +-
.../hbase/classification/package-tree.html | 6 +-
.../hadoop/hbase/client/package-tree.html | 6 +-
.../hadoop/hbase/filter/package-tree.html | 10 +-
.../hadoop/hbase/io/hfile/package-tree.html | 6 +-
.../hadoop/hbase/mapreduce/package-tree.html | 2 +-
.../hadoop/hbase/master/package-tree.html | 6 +-
.../hbase/master/procedure/package-tree.html | 2 +-
.../org/apache/hadoop/hbase/package-tree.html | 10 +-
.../hadoop/hbase/procedure2/package-tree.html | 2 +-
.../hadoop/hbase/quotas/package-tree.html | 6 +-
.../hadoop/hbase/regionserver/package-tree.html | 24 +-
.../hbase/security/access/package-tree.html | 2 +-
.../hadoop/hbase/security/package-tree.html | 2 +-
.../hadoop/hbase/thrift/package-tree.html | 4 +-
.../tmpl/master/MasterStatusTmpl.ImplData.html | 240 ++---
.../hbase/tmpl/master/MasterStatusTmpl.html | 96 +-
.../hbase/tmpl/master/MasterStatusTmplImpl.html | 48 +-
.../regionserver/RSStatusTmpl.ImplData.html | 120 +--
.../hbase/tmpl/regionserver/RSStatusTmpl.html | 48 +-
.../tmpl/regionserver/RSStatusTmplImpl.html | 24 +-
.../apache/hadoop/hbase/util/package-tree.html | 8 +-
.../apache/hadoop/hbase/wal/package-tree.html | 2 +-
.../tmpl/master/MasterStatusTmpl.ImplData.html | 240 ++---
.../tmpl/master/MasterStatusTmpl.Intf.html | 240 ++---
.../hbase/tmpl/master/MasterStatusTmpl.html | 240 ++---
.../hbase/tmpl/master/MasterStatusTmplImpl.html | 68 +-
.../regionserver/RSStatusTmpl.ImplData.html | 120 +--
.../tmpl/regionserver/RSStatusTmpl.Intf.html | 120 +--
.../hbase/tmpl/regionserver/RSStatusTmpl.html | 120 +--
.../tmpl/regionserver/RSStatusTmplImpl.html | 36 +-
distribution-management.html | 4 +-
export_control.html | 4 +-
hbase-annotations/checkstyle.html | 6 +-
hbase-annotations/dependencies.html | 6 +-
hbase-annotations/dependency-convergence.html | 6 +-
hbase-annotations/dependency-info.html | 6 +-
hbase-annotations/dependency-management.html | 6 +-
hbase-annotations/distribution-management.html | 6 +-
hbase-annotations/index.html | 6 +-
hbase-annotations/integration.html | 6 +-
hbase-annotations/issue-tracking.html | 6 +-
hbase-annotations/license.html | 6 +-
hbase-annotations/mail-lists.html | 6 +-
hbase-annotations/plugin-management.html | 6 +-
hbase-annotations/plugins.html | 6 +-
hbase-annotations/project-info.html | 6 +-
hbase-annotations/project-reports.html | 6 +-
hbase-annotations/project-summary.html | 6 +-
hbase-annotations/source-repository.html | 6 +-
hbase-annotations/team-list.html | 6 +-
hbase-spark/checkstyle.html | 6 +-
hbase-spark/dependencies.html | 6 +-
hbase-spark/dependency-convergence.html | 6 +-
hbase-spark/dependency-info.html | 6 +-
hbase-spark/dependency-management.html | 6 +-
hbase-spark/distribution-management.html | 6 +-
hbase-spark/index.html | 6 +-
hbase-spark/integration.html | 6 +-
hbase-spark/issue-tracking.html | 6 +-
hbase-spark/license.html | 6 +-
hbase-spark/mail-lists.html | 6 +-
hbase-spark/plugin-management.html | 6 +-
hbase-spark/plugins.html | 6 +-
hbase-spark/project-info.html | 6 +-
hbase-spark/project-reports.html | 6 +-
hbase-spark/project-summary.html | 6 +-
hbase-spark/source-repository.html | 6 +-
hbase-spark/team-list.html | 6 +-
index.html | 4 +-
integration.html | 4 +-
issue-tracking.html | 4 +-
license.html | 4 +-
mail-lists.html | 4 +-
metrics.html | 4 +-
modules.html | 4 +-
old_news.html | 4 +-
plugin-management.html | 4 +-
plugins.html | 4 +-
poweredbyhbase.html | 4 +-
project-info.html | 4 +-
project-reports.html | 4 +-
project-summary.html | 4 +-
pseudo-distributed.html | 4 +-
replication.html | 4 +-
resources.html | 4 +-
source-repository.html | 4 +-
sponsors.html | 4 +-
supportingprojects.html | 4 +-
team-list.html | 4 +-
testdevapidocs/index-all.html | 12 +-
.../hbase/TestIPv6NIOServerSocketChannel.html | 33 +-
.../hadoop/hbase/io/hfile/package-tree.html | 2 +-
.../org/apache/hadoop/hbase/package-tree.html | 10 +-
.../hadoop/hbase/procedure2/package-tree.html | 2 +-
...egionMergeTransactionOnCluster.MyMaster.html | 6 +-
...ransactionOnCluster.MyMasterRpcServices.html | 10 +-
.../TestRegionMergeTransactionOnCluster.html | 83 +-
.../snapshot/TestFlushSnapshotFromClient.html | 86 +-
.../hbase/TestIPv6NIOServerSocketChannel.html | 259 ++---
...egionMergeTransactionOnCluster.MyMaster.html | 1004 +++++++++---------
...ransactionOnCluster.MyMasterRpcServices.html | 1004 +++++++++---------
.../TestRegionMergeTransactionOnCluster.html | 1004 +++++++++---------
.../snapshot/TestFlushSnapshotFromClient.html | 867 ++++++++-------
.../hbase/TestIPv6NIOServerSocketChannel.html | 259 ++---
.../TestRegionMergeTransactionOnCluster.html | 1004 +++++++++---------
.../snapshot/TestFlushSnapshotFromClient.html | 867 ++++++++-------
.../hbase/tmpl/common/TaskMonitorTmpl.html | 328 +++---
.../hbase/tmpl/common/TaskMonitorTmplImpl.html | 445 ++++----
.../hbase/tmpl/master/MasterStatusTmpl.html | 240 ++---
.../hbase/tmpl/master/MasterStatusTmplImpl.html | 68 +-
.../hbase/tmpl/regionserver/RSStatusTmpl.html | 120 +--
.../tmpl/regionserver/RSStatusTmplImpl.html | 36 +-
124 files changed, 5030 insertions(+), 4937 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/acid-semantics.html
----------------------------------------------------------------------
diff --git a/acid-semantics.html b/acid-semantics.html
index a3a7010..18fb3bd 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) ACID Properties
@@ -600,7 +600,7 @@ under the License. -->
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/apache_hbase_reference_guide.pdf
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index bcdcfe9..57c8557 100644
--- a/apache_hbase_reference_guide.pdf
+++ b/apache_hbase_reference_guide.pdf
@@ -5,8 +5,8 @@
/Author (Apache HBase Team)
/Creator (Asciidoctor PDF 1.5.0.alpha.6, based on Prawn 1.2.1)
/Producer (Apache HBase Team)
-/CreationDate (D:20160216153837+00'00')
-/ModDate (D:20160216153837+00'00')
+/CreationDate (D:20160217150151+00'00')
+/ModDate (D:20160217150151+00'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/apache_hbase_reference_guide.pdfmarks
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdfmarks b/apache_hbase_reference_guide.pdfmarks
index f82d6d1..432ac0c 100644
--- a/apache_hbase_reference_guide.pdfmarks
+++ b/apache_hbase_reference_guide.pdfmarks
@@ -2,8 +2,8 @@
/Author (Apache HBase Team)
/Subject ()
/Keywords ()
- /ModDate (D:20160216154028)
- /CreationDate (D:20160216154028)
+ /ModDate (D:20160217150340)
+ /CreationDate (D:20160217150340)
/Creator (Asciidoctor PDF 1.5.0.alpha.6, based on Prawn 1.2.1)
/Producer ()
/DOCINFO pdfmark
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index 663c508..d6231b9 100644
--- a/book.html
+++ b/book.html
@@ -33120,7 +33120,7 @@ The server will return cellblocks compressed using this same compressor as long
<div id="footer">
<div id="footer-text">
Version 2.0.0-SNAPSHOT<br>
-Last updated 2016-02-16 15:14:18 UTC
+Last updated 2016-02-17 14:35:27 UTC
</div>
</div>
</body>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index 40287b8..e925531 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Bulk Loads in Apache HBase (TM)
@@ -305,7 +305,7 @@ under the License. -->
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/checkstyle-aggregate.html
----------------------------------------------------------------------
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index 749613c..35e6ed0 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Checkstyle Results</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -6124,12 +6124,12 @@
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#JavadocTagContinuationIndentation">JavadocTagContinuationIndentation</a>
<ul>
<li>offset: <tt>"2"</tt></li></ul></td>
-<td>766</td>
+<td>767</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="a">
<td></td>
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
-<td>3400</td>
+<td>3399</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="b">
<td>misc</td>
@@ -14553,7 +14553,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 64 has parse error. Missed HTML close tag 'code'. Sometimes it means that close tag missed for one of previous tags.</td>
<td><a href="./xref/org/apache/hadoop/hbase/client/HBaseAdmin.html#L1767">1767</a></td></tr>
<tr class="a">
@@ -92964,7 +92964,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/coc.html
----------------------------------------------------------------------
diff --git a/coc.html b/coc.html
index e1fdc5d..2b7410c 100644
--- a/coc.html
+++ b/coc.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Code of Conduct Policy
@@ -331,7 +331,7 @@ For flagrant violations requiring a firm response the PMC may opt to skip early
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/cygwin.html
----------------------------------------------------------------------
diff --git a/cygwin.html b/cygwin.html
index 5f2ef03..30f262e 100644
--- a/cygwin.html
+++ b/cygwin.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Installing Apache HBase (TM) on Windows using Cygwin</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -673,7 +673,7 @@ Now your <b>HBase </b>server is running, <b>start coding</b> and build that next
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/dependencies.html
----------------------------------------------------------------------
diff --git a/dependencies.html b/dependencies.html
index 8bdd989..5dd3bea 100644
--- a/dependencies.html
+++ b/dependencies.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Dependencies</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -518,7 +518,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/dependency-convergence.html b/dependency-convergence.html
index 4a5d0a5..85f774b 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Reactor Dependency Convergence</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -1617,7 +1617,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/dependency-info.html
----------------------------------------------------------------------
diff --git a/dependency-info.html b/dependency-info.html
index 81293b2..540d6b5 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Dependency Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -312,7 +312,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/dependency-management.html
----------------------------------------------------------------------
diff --git a/dependency-management.html b/dependency-management.html
index 5f43d40..46b4482 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Dependency Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -786,7 +786,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html b/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
index bf67fda..ccc01bb 100644
--- a/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
@@ -80,12 +80,12 @@
</ul>
<h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
<ul>
-<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.LimitedPrivate.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.LimitedPrivate</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Evolving.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Evolving</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Stable.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Stable</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.Private</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.LimitedPrivate.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.LimitedPrivate</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Public.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.Public</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Unstable.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Unstable</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.Private</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Stable.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Stable</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
</ul>
</div>
<!-- ======= START OF BOTTOM NAVBAR ====== -->
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
index 2ee72b6..0f78a6e 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -389,11 +389,11 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcess.Retry.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">AsyncProcess.Retry</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">IsolationLevel</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">Consistency</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">Admin.CompactType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">Durability</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcess.Retry.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">AsyncProcess.Retry</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">Admin.CompactType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">IsolationLevel</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">TableState.State</span></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
index 9e62ed5..aaa2515 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
@@ -161,14 +161,14 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">Filter.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">RegexStringComparator.EngineType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">CompareFilter.CompareOp</span></a></li>
<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FilterWrapper.FilterRowRetCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FuzzyRowFilter.Order</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FuzzyRowFilter.SatisfiesCode</span></a></li>
<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FilterList.Operator</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">Filter.ReturnCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FuzzyRowFilter.SatisfiesCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FuzzyRowFilter.Order</span></a></li>
<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">BitComparator.BitwiseOp</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">RegexStringComparator.EngineType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">CompareFilter.CompareOp</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index 32386e8..646fd64 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -271,11 +271,11 @@
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">BlockPriority</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">BlockType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.BlockCategory.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">BlockType.BlockCategory</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">HFileBlock.Writer.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">CacheConfig.ExternalBlockCaches</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">Cacheable.MemoryType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.BlockCategory.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">BlockType.BlockCategory</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">BlockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">CacheConfig.ExternalBlockCaches</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
index 8697762..e166280 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -267,9 +267,9 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">SyncTable.SyncMapper.Counter</span></a></li>
<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.Version.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">TableSplit.Version</span></a></li>
<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">CellCounter.CellCounterMapper.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">SyncTable.SyncMapper.Counter</span></a></li>
<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">RowCounter.RowCounterMapper.Counters</span></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
index 27791d9..615e647 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -318,11 +318,11 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">SplitLogManager.ResubmitDirective</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">MasterRpcServices.BalanceSwitchMode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">RegionState.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">SplitLogManager.TerminationStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">RegionState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">SplitLogManager.ResubmitDirective</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
index 409bb8a..ecf9de1 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
@@ -145,8 +145,8 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.ServerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="strong">ServerProcedureInterface.ServerOperationType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="strong">TableProcedureInterface.TableOperationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.ServerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="strong">ServerProcedureInterface.ServerOperationType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.MarkRegionOfflineOpResult.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="strong">DisableTableProcedure.MarkRegionOfflineOpResult</span></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index d78b902..3ce2650 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -361,14 +361,14 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="strong">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="strong">MetaTableAccessor.QueryType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HConstants.OperationStatusCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="strong">Coprocessor.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HealthChecker.HealthCheckerExitStatus</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="strong">KeyValue.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HConstants.OperationStatusCode</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.Modify.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HConstants.Modify</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="strong">KeyValue.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="strong">KeepDeletedCells</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="strong">Coprocessor.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="strong">MetaTableAccessor.QueryType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="strong">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index a73d0a7..19ef617 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -120,8 +120,8 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/RootProcedureState.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">RootProcedureState.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">StateMachineProcedure.Flow</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/RootProcedureState.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">RootProcedureState.State</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
index 09ea6f3..87e2bf6 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
@@ -172,11 +172,11 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">ThrottleType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">OperationQuota.OperationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">QuotaScope</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">ThrottlingException.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">QuotaType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">QuotaScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">ThrottleType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">OperationQuota.OperationType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 737ecb4..7e81359 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -629,24 +629,24 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DefaultHeapMemoryTuner.StepDirection</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">Region.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DeleteTracker.DeleteResult</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreScanner.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">MemStoreScanner.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">FlushType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.NextState</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.RegionMergeTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">RegionMergeTransaction.RegionMergeTransactionPhase</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScanQueryMatcher.MatchCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">StoreScanner.StoreScannerCompactionRace</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DeleteTracker.DeleteResult</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionOpeningState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">RegionOpeningState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">BloomType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.LimitScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreScanner.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">MemStoreScanner.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScanType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DeleteTracker.DeleteCompare.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DeleteTracker.DeleteCompare</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">Region.FlushResult.Result</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">Region.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DefaultHeapMemoryTuner.StepDirection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">StoreScanner.StoreScannerCompactionRace</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">SplitLogWorker.TaskExecutor.Status</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">Region.FlushResult.Result</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.SplitTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">SplitTransaction.SplitTransactionPhase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DeleteTracker.DeleteCompare.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DeleteTracker.DeleteCompare</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScanQueryMatcher.MatchCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.LimitScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">BloomType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.RegionMergeTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">RegionMergeTransaction.RegionMergeTransactionPhase</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
index bdae472..86e9213 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -140,9 +140,9 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="strong">AccessControlFilter.Strategy</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="strong">AccessController.OpType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="strong">Permission.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="strong">AccessControlFilter.Strategy</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
index 6aea795..86f4d59 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
@@ -152,9 +152,9 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">SaslUtil.QualityOfProtection</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/AuthMethod.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">AuthMethod</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">SaslStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">SaslUtil.QualityOfProtection</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
index 6816e64..cfd2380 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
@@ -159,9 +159,9 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="strong">ThriftMetrics.ThriftServerType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="strong">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="strong">ThriftServerRunner.ImplType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="strong">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="strong">ThriftMetrics.ThriftServerType</span></a></li>
</ul>
</li>
</ul>
[08/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
index 2ffc548..3130227 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
@@ -42,260 +42,260 @@
<span class="sourceLineNo">034</span>import org.apache.hadoop.conf.Configuration;<a name="line.34"></a>
<span class="sourceLineNo">035</span>import org.apache.hadoop.fs.FileSystem;<a name="line.35"></a>
<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.Path;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HConstants;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.TableName;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Table;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.After;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.AfterClass;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.Before;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.junit.BeforeClass;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.junit.Test;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.junit.Ignore;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.junit.experimental.categories.Category;<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>/**<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * Test creating/using/deleting snapshots from the client<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * <p><a name="line.61"></a>
-<span class="sourceLineNo">062</span> * This is an end-to-end test for the snapshot utility<a name="line.62"></a>
-<span class="sourceLineNo">063</span> *<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * TODO This is essentially a clone of TestSnapshotFromClient. This is worth refactoring this<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * because there will be a few more flavors of snapshots that need to run these tests.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>@Category({RegionServerTests.class, LargeTests.class})<a name="line.67"></a>
-<span class="sourceLineNo">068</span>public class TestFlushSnapshotFromClient {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> private static final Log LOG = LogFactory.getLog(TestFlushSnapshotFromClient.class);<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.71"></a>
-<span class="sourceLineNo">072</span> protected static final int NUM_RS = 2;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> protected static final byte[] TEST_FAM = Bytes.toBytes("fam");<a name="line.73"></a>
-<span class="sourceLineNo">074</span> protected static final TableName TABLE_NAME = TableName.valueOf("test");<a name="line.74"></a>
-<span class="sourceLineNo">075</span> protected final int DEFAULT_NUM_ROWS = 100;<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> @BeforeClass<a name="line.77"></a>
-<span class="sourceLineNo">078</span> public static void setupCluster() throws Exception {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> setupConf(UTIL.getConfiguration());<a name="line.79"></a>
-<span class="sourceLineNo">080</span> UTIL.startMiniCluster(NUM_RS);<a name="line.80"></a>
-<span class="sourceLineNo">081</span> }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> protected static void setupConf(Configuration conf) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> // disable the ui<a name="line.84"></a>
-<span class="sourceLineNo">085</span> conf.setInt("hbase.regionsever.info.port", -1);<a name="line.85"></a>
-<span class="sourceLineNo">086</span> // change the flush size to a small amount, regulating number of store files<a name="line.86"></a>
-<span class="sourceLineNo">087</span> conf.setInt("hbase.hregion.memstore.flush.size", 25000);<a name="line.87"></a>
-<span class="sourceLineNo">088</span> // so make sure we get a compaction when doing a load, but keep around some<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // files in the store<a name="line.89"></a>
-<span class="sourceLineNo">090</span> conf.setInt("hbase.hstore.compaction.min", 10);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> conf.setInt("hbase.hstore.compactionThreshold", 10);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // block writes if we get to 12 store files<a name="line.92"></a>
-<span class="sourceLineNo">093</span> conf.setInt("hbase.hstore.blockingStoreFiles", 12);<a name="line.93"></a>
-<span class="sourceLineNo">094</span> // Enable snapshot<a name="line.94"></a>
-<span class="sourceLineNo">095</span> conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY,<a name="line.96"></a>
-<span class="sourceLineNo">097</span> ConstantSizeRegionSplitPolicy.class.getName());<a name="line.97"></a>
-<span class="sourceLineNo">098</span> }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span> @Before<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public void setup() throws Exception {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> createTable();<a name="line.102"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.CategoryBasedTimeout;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HConstants;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.TableName;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Table;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.After;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.AfterClass;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.Before;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.BeforeClass;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.Rule;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.Test;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.junit.experimental.categories.Category;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.junit.rules.TestRule;<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>/**<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * Test creating/using/deleting snapshots from the client<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * <p><a name="line.63"></a>
+<span class="sourceLineNo">064</span> * This is an end-to-end test for the snapshot utility<a name="line.64"></a>
+<span class="sourceLineNo">065</span> *<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * TODO This is essentially a clone of TestSnapshotFromClient. This is worth refactoring this<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * because there will be a few more flavors of snapshots that need to run these tests.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>@Category({RegionServerTests.class, LargeTests.class})<a name="line.69"></a>
+<span class="sourceLineNo">070</span>public class TestFlushSnapshotFromClient {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private static final Log LOG = LogFactory.getLog(TestFlushSnapshotFromClient.class);<a name="line.71"></a>
+<span class="sourceLineNo">072</span> @Rule public final TestRule timeout = CategoryBasedTimeout.builder().withTimeout(this.getClass()).<a name="line.72"></a>
+<span class="sourceLineNo">073</span> withLookingForStuckThread(true).build();<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.75"></a>
+<span class="sourceLineNo">076</span> protected static final int NUM_RS = 2;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> protected static final byte[] TEST_FAM = Bytes.toBytes("fam");<a name="line.77"></a>
+<span class="sourceLineNo">078</span> protected static final TableName TABLE_NAME = TableName.valueOf("test");<a name="line.78"></a>
+<span class="sourceLineNo">079</span> protected final int DEFAULT_NUM_ROWS = 100;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> protected Admin admin = null;<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> @BeforeClass<a name="line.82"></a>
+<span class="sourceLineNo">083</span> public static void setupCluster() throws Exception {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> setupConf(UTIL.getConfiguration());<a name="line.84"></a>
+<span class="sourceLineNo">085</span> UTIL.startMiniCluster(NUM_RS);<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> protected static void setupConf(Configuration conf) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> // disable the ui<a name="line.89"></a>
+<span class="sourceLineNo">090</span> conf.setInt("hbase.regionsever.info.port", -1);<a name="line.90"></a>
+<span class="sourceLineNo">091</span> // change the flush size to a small amount, regulating number of store files<a name="line.91"></a>
+<span class="sourceLineNo">092</span> conf.setInt("hbase.hregion.memstore.flush.size", 25000);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> // so make sure we get a compaction when doing a load, but keep around some<a name="line.93"></a>
+<span class="sourceLineNo">094</span> // files in the store<a name="line.94"></a>
+<span class="sourceLineNo">095</span> conf.setInt("hbase.hstore.compaction.min", 10);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> conf.setInt("hbase.hstore.compactionThreshold", 10);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> // block writes if we get to 12 store files<a name="line.97"></a>
+<span class="sourceLineNo">098</span> conf.setInt("hbase.hstore.blockingStoreFiles", 12);<a name="line.98"></a>
+<span class="sourceLineNo">099</span> // Enable snapshot<a name="line.99"></a>
+<span class="sourceLineNo">100</span> conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY,<a name="line.101"></a>
+<span class="sourceLineNo">102</span> ConstantSizeRegionSplitPolicy.class.getName());<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> protected void createTable() throws Exception {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> SnapshotTestingUtils.createTable(UTIL, TABLE_NAME, TEST_FAM);<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> @After<a name="line.109"></a>
-<span class="sourceLineNo">110</span> public void tearDown() throws Exception {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> UTIL.deleteTable(TABLE_NAME);<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span> SnapshotTestingUtils.deleteAllSnapshots(UTIL.getHBaseAdmin());<a name="line.113"></a>
-<span class="sourceLineNo">114</span> SnapshotTestingUtils.deleteArchiveDirectory(UTIL);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span> @AfterClass<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public static void cleanupTest() throws Exception {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> try {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> UTIL.shutdownMiniCluster();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> } catch (Exception e) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> LOG.warn("failure shutting down cluster", e);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> /**<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * Test simple flush snapshotting a table that is online<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * @throws Exception<a name="line.128"></a>
-<span class="sourceLineNo">129</span> */<a name="line.129"></a>
-<span class="sourceLineNo">130</span> @Test (timeout=300000)<a name="line.130"></a>
-<span class="sourceLineNo">131</span> public void testFlushTableSnapshot() throws Exception {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.132"></a>
-<span class="sourceLineNo">133</span> // make sure we don't fail on listing snapshots<a name="line.133"></a>
-<span class="sourceLineNo">134</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> // put some stuff in the table<a name="line.136"></a>
-<span class="sourceLineNo">137</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span> LOG.debug("FS state before snapshot:");<a name="line.139"></a>
-<span class="sourceLineNo">140</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> // take a snapshot of the enabled table<a name="line.142"></a>
-<span class="sourceLineNo">143</span> String snapshotString = "offlineTableSnapshot";<a name="line.143"></a>
-<span class="sourceLineNo">144</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.FLUSH);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> LOG.debug("Snapshot completed.");<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> // make sure we have the snapshot<a name="line.148"></a>
-<span class="sourceLineNo">149</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.149"></a>
-<span class="sourceLineNo">150</span> snapshot, TABLE_NAME);<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> // make sure its a valid snapshot<a name="line.152"></a>
-<span class="sourceLineNo">153</span> LOG.debug("FS state after snapshot:");<a name="line.153"></a>
-<span class="sourceLineNo">154</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> /**<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * Test snapshotting a table that is online without flushing<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * @throws Exception<a name="line.161"></a>
-<span class="sourceLineNo">162</span> */<a name="line.162"></a>
-<span class="sourceLineNo">163</span> @Test(timeout=30000)<a name="line.163"></a>
-<span class="sourceLineNo">164</span> public void testSkipFlushTableSnapshot() throws Exception {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.165"></a>
-<span class="sourceLineNo">166</span> // make sure we don't fail on listing snapshots<a name="line.166"></a>
-<span class="sourceLineNo">167</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> // put some stuff in the table<a name="line.169"></a>
-<span class="sourceLineNo">170</span> Table table = UTIL.getConnection().getTable(TABLE_NAME);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> UTIL.loadTable(table, TEST_FAM);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> UTIL.flush(TABLE_NAME);<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span> LOG.debug("FS state before snapshot:");<a name="line.174"></a>
-<span class="sourceLineNo">175</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> // take a snapshot of the enabled table<a name="line.177"></a>
-<span class="sourceLineNo">178</span> String snapshotString = "skipFlushTableSnapshot";<a name="line.178"></a>
-<span class="sourceLineNo">179</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.SKIPFLUSH);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> LOG.debug("Snapshot completed.");<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> // make sure we have the snapshot<a name="line.183"></a>
-<span class="sourceLineNo">184</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.184"></a>
-<span class="sourceLineNo">185</span> snapshot, TABLE_NAME);<a name="line.185"></a>
+<span class="sourceLineNo">105</span> @Before<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public void setup() throws Exception {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> createTable();<a name="line.107"></a>
+<span class="sourceLineNo">108</span> this.admin = UTIL.getConnection().getAdmin();<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> protected void createTable() throws Exception {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> SnapshotTestingUtils.createTable(UTIL, TABLE_NAME, TEST_FAM);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> @After<a name="line.115"></a>
+<span class="sourceLineNo">116</span> public void tearDown() throws Exception {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> UTIL.deleteTable(TABLE_NAME);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> SnapshotTestingUtils.deleteAllSnapshots(this.admin);<a name="line.118"></a>
+<span class="sourceLineNo">119</span> this.admin.close();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> SnapshotTestingUtils.deleteArchiveDirectory(UTIL);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> @AfterClass<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public static void cleanupTest() throws Exception {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> try {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> UTIL.shutdownMiniCluster();<a name="line.126"></a>
+<span class="sourceLineNo">127</span> } catch (Exception e) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> LOG.warn("failure shutting down cluster", e);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * Test simple flush snapshotting a table that is online<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * @throws Exception<a name="line.134"></a>
+<span class="sourceLineNo">135</span> */<a name="line.135"></a>
+<span class="sourceLineNo">136</span> @Test<a name="line.136"></a>
+<span class="sourceLineNo">137</span> public void testFlushTableSnapshot() throws Exception {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> // make sure we don't fail on listing snapshots<a name="line.138"></a>
+<span class="sourceLineNo">139</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> // put some stuff in the table<a name="line.141"></a>
+<span class="sourceLineNo">142</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> LOG.debug("FS state before snapshot:");<a name="line.144"></a>
+<span class="sourceLineNo">145</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> // take a snapshot of the enabled table<a name="line.147"></a>
+<span class="sourceLineNo">148</span> String snapshotString = "offlineTableSnapshot";<a name="line.148"></a>
+<span class="sourceLineNo">149</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.FLUSH);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> LOG.debug("Snapshot completed.");<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span> // make sure we have the snapshot<a name="line.153"></a>
+<span class="sourceLineNo">154</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.154"></a>
+<span class="sourceLineNo">155</span> snapshot, TABLE_NAME);<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> // make sure its a valid snapshot<a name="line.157"></a>
+<span class="sourceLineNo">158</span> LOG.debug("FS state after snapshot:");<a name="line.158"></a>
+<span class="sourceLineNo">159</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span> /**<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * Test snapshotting a table that is online without flushing<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @throws Exception<a name="line.166"></a>
+<span class="sourceLineNo">167</span> */<a name="line.167"></a>
+<span class="sourceLineNo">168</span> @Test<a name="line.168"></a>
+<span class="sourceLineNo">169</span> public void testSkipFlushTableSnapshot() throws Exception {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> // make sure we don't fail on listing snapshots<a name="line.170"></a>
+<span class="sourceLineNo">171</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> // put some stuff in the table<a name="line.173"></a>
+<span class="sourceLineNo">174</span> Table table = UTIL.getConnection().getTable(TABLE_NAME);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> UTIL.loadTable(table, TEST_FAM);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> UTIL.flush(TABLE_NAME);<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> LOG.debug("FS state before snapshot:");<a name="line.178"></a>
+<span class="sourceLineNo">179</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> // take a snapshot of the enabled table<a name="line.181"></a>
+<span class="sourceLineNo">182</span> String snapshotString = "skipFlushTableSnapshot";<a name="line.182"></a>
+<span class="sourceLineNo">183</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.SKIPFLUSH);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.debug("Snapshot completed.");<a name="line.185"></a>
<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> // make sure its a valid snapshot<a name="line.187"></a>
-<span class="sourceLineNo">188</span> LOG.debug("FS state after snapshot:");<a name="line.188"></a>
-<span class="sourceLineNo">189</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.189"></a>
+<span class="sourceLineNo">187</span> // make sure we have the snapshot<a name="line.187"></a>
+<span class="sourceLineNo">188</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.188"></a>
+<span class="sourceLineNo">189</span> snapshot, TABLE_NAME);<a name="line.189"></a>
<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> admin.deleteSnapshot(snapshot);<a name="line.193"></a>
-<span class="sourceLineNo">194</span> snapshots = admin.listSnapshots();<a name="line.194"></a>
-<span class="sourceLineNo">195</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><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> * Test simple flush snapshotting a table that is online<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * @throws Exception<a name="line.201"></a>
-<span class="sourceLineNo">202</span> */<a name="line.202"></a>
-<span class="sourceLineNo">203</span> @Test (timeout=300000)<a name="line.203"></a>
-<span class="sourceLineNo">204</span> public void testFlushTableSnapshotWithProcedure() throws Exception {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.205"></a>
-<span class="sourceLineNo">206</span> // make sure we don't fail on listing snapshots<a name="line.206"></a>
-<span class="sourceLineNo">207</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> // put some stuff in the table<a name="line.209"></a>
-<span class="sourceLineNo">210</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.210"></a>
+<span class="sourceLineNo">191</span> // make sure its a valid snapshot<a name="line.191"></a>
+<span class="sourceLineNo">192</span> LOG.debug("FS state after snapshot:");<a name="line.192"></a>
+<span class="sourceLineNo">193</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span> admin.deleteSnapshot(snapshot);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> snapshots = admin.listSnapshots();<a name="line.198"></a>
+<span class="sourceLineNo">199</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> /**<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * Test simple flush snapshotting a table that is online<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * @throws Exception<a name="line.205"></a>
+<span class="sourceLineNo">206</span> */<a name="line.206"></a>
+<span class="sourceLineNo">207</span> @Test<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public void testFlushTableSnapshotWithProcedure() throws Exception {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> // make sure we don't fail on listing snapshots<a name="line.209"></a>
+<span class="sourceLineNo">210</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.210"></a>
<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span> LOG.debug("FS state before snapshot:");<a name="line.212"></a>
-<span class="sourceLineNo">213</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.213"></a>
+<span class="sourceLineNo">212</span> // put some stuff in the table<a name="line.212"></a>
+<span class="sourceLineNo">213</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.213"></a>
<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> // take a snapshot of the enabled table<a name="line.215"></a>
-<span class="sourceLineNo">216</span> String snapshotString = "offlineTableSnapshot";<a name="line.216"></a>
-<span class="sourceLineNo">217</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> Map<String, String> props = new HashMap<String, String>();<a name="line.218"></a>
-<span class="sourceLineNo">219</span> props.put("table", TABLE_NAME.getNameAsString());<a name="line.219"></a>
-<span class="sourceLineNo">220</span> admin.execProcedure(SnapshotManager.ONLINE_SNAPSHOT_CONTROLLER_DESCRIPTION,<a name="line.220"></a>
-<span class="sourceLineNo">221</span> snapshotString, props);<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> LOG.debug("Snapshot completed.");<a name="line.224"></a>
+<span class="sourceLineNo">215</span> LOG.debug("FS state before snapshot:");<a name="line.215"></a>
+<span class="sourceLineNo">216</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> // take a snapshot of the enabled table<a name="line.218"></a>
+<span class="sourceLineNo">219</span> String snapshotString = "offlineTableSnapshot";<a name="line.219"></a>
+<span class="sourceLineNo">220</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.220"></a>
+<span class="sourceLineNo">221</span> Map<String, String> props = new HashMap<String, String>();<a name="line.221"></a>
+<span class="sourceLineNo">222</span> props.put("table", TABLE_NAME.getNameAsString());<a name="line.222"></a>
+<span class="sourceLineNo">223</span> admin.execProcedure(SnapshotManager.ONLINE_SNAPSHOT_CONTROLLER_DESCRIPTION,<a name="line.223"></a>
+<span class="sourceLineNo">224</span> snapshotString, props);<a name="line.224"></a>
<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> // make sure we have the snapshot<a name="line.226"></a>
-<span class="sourceLineNo">227</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.227"></a>
-<span class="sourceLineNo">228</span> snapshot, TABLE_NAME);<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> // make sure its a valid snapshot<a name="line.230"></a>
-<span class="sourceLineNo">231</span> LOG.debug("FS state after snapshot:");<a name="line.231"></a>
-<span class="sourceLineNo">232</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span> LOG.debug("Snapshot completed.");<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> // make sure we have the snapshot<a name="line.229"></a>
+<span class="sourceLineNo">230</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.230"></a>
+<span class="sourceLineNo">231</span> snapshot, TABLE_NAME);<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span> // make sure its a valid snapshot<a name="line.233"></a>
+<span class="sourceLineNo">234</span> LOG.debug("FS state after snapshot:");<a name="line.234"></a>
+<span class="sourceLineNo">235</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.235"></a>
<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> @Test (timeout=300000)<a name="line.237"></a>
-<span class="sourceLineNo">238</span> public void testSnapshotFailsOnNonExistantTable() throws Exception {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> // make sure we don't fail on listing snapshots<a name="line.240"></a>
-<span class="sourceLineNo">241</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> TableName tableName = TableName.valueOf("_not_a_table");<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> // make sure the table doesn't exist<a name="line.244"></a>
-<span class="sourceLineNo">245</span> boolean fail = false;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> do {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> try {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> admin.getTableDescriptor(tableName);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> fail = true;<a name="line.249"></a>
-<span class="sourceLineNo">250</span> LOG.error("Table:" + tableName + " already exists, checking a new name");<a name="line.250"></a>
-<span class="sourceLineNo">251</span> tableName = TableName.valueOf(tableName+"!");<a name="line.251"></a>
-<span class="sourceLineNo">252</span> } catch (TableNotFoundException e) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> fail = false;<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span> } while (fail);<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> // snapshot the non-existant table<a name="line.257"></a>
-<span class="sourceLineNo">258</span> try {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> admin.snapshot("fail", tableName, SnapshotDescription.Type.FLUSH);<a name="line.259"></a>
-<span class="sourceLineNo">260</span> fail("Snapshot succeeded even though there is not table.");<a name="line.260"></a>
-<span class="sourceLineNo">261</span> } catch (SnapshotCreationException e) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> LOG.info("Correctly failed to snapshot a non-existant table:" + e.getMessage());<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> @Test(timeout = 300000)<a name="line.266"></a>
-<span class="sourceLineNo">267</span> public void testAsyncFlushSnapshot() throws Exception {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.268"></a>
-<span class="sourceLineNo">269</span> SnapshotDescription snapshot = SnapshotDescription.newBuilder().setName("asyncSnapshot")<a name="line.269"></a>
-<span class="sourceLineNo">270</span> .setTable(TABLE_NAME.getNameAsString())<a name="line.270"></a>
-<span class="sourceLineNo">271</span> .setType(SnapshotDescription.Type.FLUSH)<a name="line.271"></a>
-<span class="sourceLineNo">272</span> .build();<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> // take the snapshot async<a name="line.274"></a>
-<span class="sourceLineNo">275</span> admin.takeSnapshotAsync(snapshot);<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> // constantly loop, looking for the snapshot to complete<a name="line.277"></a>
-<span class="sourceLineNo">278</span> HMaster master = UTIL.getMiniHBaseCluster().getMaster();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> SnapshotTestingUtils.waitForSnapshotToComplete(master, snapshot, 200);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> LOG.info(" === Async Snapshot Completed ===");<a name="line.280"></a>
-<span class="sourceLineNo">281</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.281"></a>
-<span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span> // make sure we get the snapshot<a name="line.283"></a>
-<span class="sourceLineNo">284</span> SnapshotTestingUtils.assertOneSnapshotThatMatches(admin, snapshot);<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> @Test (timeout=300000)<a name="line.287"></a>
-<span class="sourceLineNo">288</span> public void testSnapshotStateAfterMerge() throws Exception {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> int numRows = DEFAULT_NUM_ROWS;<a name="line.289"></a>
-<span class="sourceLineNo">290</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.290"></a>
+<span class="sourceLineNo">237</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span> @Test<a name="line.240"></a>
+<span class="sourceLineNo">241</span> public void testSnapshotFailsOnNonExistantTable() throws Exception {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> // make sure we don't fail on listing snapshots<a name="line.242"></a>
+<span class="sourceLineNo">243</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.243"></a>
+<span class="sourceLineNo">244</span> TableName tableName = TableName.valueOf("_not_a_table");<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> // make sure the table doesn't exist<a name="line.246"></a>
+<span class="sourceLineNo">247</span> boolean fail = false;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> do {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> try {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> admin.getTableDescriptor(tableName);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> fail = true;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> LOG.error("Table:" + tableName + " already exists, checking a new name");<a name="line.252"></a>
+<span class="sourceLineNo">253</span> tableName = TableName.valueOf(tableName+"!");<a name="line.253"></a>
+<span class="sourceLineNo">254</span> } catch (TableNotFoundException e) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> fail = false;<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> } while (fail);<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span> // snapshot the non-existant table<a name="line.259"></a>
+<span class="sourceLineNo">260</span> try {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> admin.snapshot("fail", tableName, SnapshotDescription.Type.FLUSH);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> fail("Snapshot succeeded even though there is not table.");<a name="line.262"></a>
+<span class="sourceLineNo">263</span> } catch (SnapshotCreationException e) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> LOG.info("Correctly failed to snapshot a non-existant table:" + e.getMessage());<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> @Test<a name="line.268"></a>
+<span class="sourceLineNo">269</span> public void testAsyncFlushSnapshot() throws Exception {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> SnapshotDescription snapshot = SnapshotDescription.newBuilder().setName("asyncSnapshot")<a name="line.270"></a>
+<span class="sourceLineNo">271</span> .setTable(TABLE_NAME.getNameAsString())<a name="line.271"></a>
+<span class="sourceLineNo">272</span> .setType(SnapshotDescription.Type.FLUSH)<a name="line.272"></a>
+<span class="sourceLineNo">273</span> .build();<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> // take the snapshot async<a name="line.275"></a>
+<span class="sourceLineNo">276</span> admin.takeSnapshotAsync(snapshot);<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span> // constantly loop, looking for the snapshot to complete<a name="line.278"></a>
+<span class="sourceLineNo">279</span> HMaster master = UTIL.getMiniHBaseCluster().getMaster();<a name="line.279"></a>
+<span class="sourceLineNo">280</span> SnapshotTestingUtils.waitForSnapshotToComplete(master, snapshot, 200);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> LOG.info(" === Async Snapshot Completed ===");<a name="line.281"></a>
+<span class="sourceLineNo">282</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span> // make sure we get the snapshot<a name="line.284"></a>
+<span class="sourceLineNo">285</span> SnapshotTestingUtils.assertOneSnapshotThatMatches(admin, snapshot);<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> @Test<a name="line.288"></a>
+<span class="sourceLineNo">289</span> public void testSnapshotStateAfterMerge() throws Exception {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> int numRows = DEFAULT_NUM_ROWS;<a name="line.290"></a>
<span class="sourceLineNo">291</span> // make sure we don't fail on listing snapshots<a name="line.291"></a>
<span class="sourceLineNo">292</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.292"></a>
<span class="sourceLineNo">293</span> // load the table so we have some data<a name="line.293"></a>
@@ -343,199 +343,194 @@
<span class="sourceLineNo">335</span> UTIL.deleteTable(cloneBeforeMergeName);<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> @Test (timeout=300000)<a name="line.338"></a>
+<span class="sourceLineNo">338</span> @Test<a name="line.338"></a>
<span class="sourceLineNo">339</span> public void testTakeSnapshotAfterMerge() throws Exception {<a name="line.339"></a>
<span class="sourceLineNo">340</span> int numRows = DEFAULT_NUM_ROWS;<a name="line.340"></a>
-<span class="sourceLineNo">341</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.341"></a>
-<span class="sourceLineNo">342</span> // make sure we don't fail on listing snapshots<a name="line.342"></a>
-<span class="sourceLineNo">343</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> // load the table so we have some data<a name="line.344"></a>
-<span class="sourceLineNo">345</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, numRows, TEST_FAM);<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> // Merge two regions<a name="line.347"></a>
-<span class="sourceLineNo">348</span> List<HRegionInfo> regions = admin.getTableRegions(TABLE_NAME);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> Collections.sort(regions, new Comparator<HRegionInfo>() {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> public int compare(HRegionInfo r1, HRegionInfo r2) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> return Bytes.compareTo(r1.getStartKey(), r2.getStartKey());<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> });<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> int numRegions = admin.getTableRegions(TABLE_NAME).size();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> int numRegionsAfterMerge = numRegions - 2;<a name="line.356"></a>
-<span class="sourceLineNo">357</span> admin.mergeRegions(regions.get(1).getEncodedNameAsBytes(),<a name="line.357"></a>
-<span class="sourceLineNo">358</span> regions.get(2).getEncodedNameAsBytes(), true);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> admin.mergeRegions(regions.get(5).getEncodedNameAsBytes(),<a name="line.359"></a>
-<span class="sourceLineNo">360</span> regions.get(6).getEncodedNameAsBytes(), true);<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> waitRegionsAfterMerge(numRegionsAfterMerge);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> assertEquals(numRegionsAfterMerge, admin.getTableRegions(TABLE_NAME).size());<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> // Take a snapshot<a name="line.365"></a>
-<span class="sourceLineNo">366</span> String snapshotName = "snapshotAfterMerge";<a name="line.366"></a>
-<span class="sourceLineNo">367</span> SnapshotTestingUtils.snapshot(admin, snapshotName, TABLE_NAME.getNameAsString(),<a name="line.367"></a>
-<span class="sourceLineNo">368</span> SnapshotDescription.Type.FLUSH, 3);<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> // Clone the table<a name="line.370"></a>
-<span class="sourceLineNo">371</span> TableName cloneName = TableName.valueOf("cloneMerge");<a name="line.371"></a>
-<span class="sourceLineNo">372</span> admin.cloneSnapshot(snapshotName, cloneName);<a name="line.372"></a>
-<span class="sourceLineNo">373</span> SnapshotTestingUtils.waitForTableToBeOnline(UTIL, cloneName);<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> verifyRowCount(UTIL, TABLE_NAME, numRows);<a name="line.375"></a>
-<span class="sourceLineNo">376</span> verifyRowCount(UTIL, cloneName, numRows);<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span> // test that we can delete the snapshot<a name="line.378"></a>
-<span class="sourceLineNo">379</span> UTIL.deleteTable(cloneName);<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> * Basic end-to-end test of simple-flush-based snapshots<a name="line.383"></a>
-<span class="sourceLineNo">384</span> */<a name="line.384"></a>
-<span class="sourceLineNo">385</span> @Test (timeout=300000)<a name="line.385"></a>
-<span class="sourceLineNo">386</span> public void testFlushCreateListDestroy() throws Exception {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> LOG.debug("------- Starting Snapshot test -------------");<a name="line.387"></a>
-<span class="sourceLineNo">388</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.388"></a>
-<span class="sourceLineNo">389</span> // make sure we don't fail on listing snapshots<a name="line.389"></a>
-<span class="sourceLineNo">390</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> // load the table so we have some data<a name="line.391"></a>
-<span class="sourceLineNo">392</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span> String snapshotName = "flushSnapshotCreateListDestroy";<a name="line.394"></a>
-<span class="sourceLineNo">395</span> FileSystem fs = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getFileSystem();<a name="line.395"></a>
-<span class="sourceLineNo">396</span> Path rootDir = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir();<a name="line.396"></a>
-<span class="sourceLineNo">397</span> SnapshotTestingUtils.createSnapshotAndValidate(admin, TABLE_NAME, Bytes.toString(TEST_FAM),<a name="line.397"></a>
-<span class="sourceLineNo">398</span> snapshotName, rootDir, fs, true);<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> /**<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * Demonstrate that we reject snapshot requests if there is a snapshot already running on the<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * same table currently running and that concurrent snapshots on different tables can both<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * succeed concurretly.<a name="line.404"></a>
-<span class="sourceLineNo">405</span> */<a name="line.405"></a>
-<span class="sourceLineNo">406</span> @Test(timeout=300000)<a name="line.406"></a>
-<span class="sourceLineNo">407</span> public void testConcurrentSnapshottingAttempts() throws IOException, InterruptedException {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> final TableName TABLE2_NAME = TableName.valueOf(TABLE_NAME + "2");<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> int ssNum = 20;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.411"></a>
-<span class="sourceLineNo">412</span> // make sure we don't fail on listing snapshots<a name="line.412"></a>
-<span class="sourceLineNo">413</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> // create second testing table<a name="line.414"></a>
-<span class="sourceLineNo">415</span> SnapshotTestingUtils.createTable(UTIL, TABLE2_NAME, TEST_FAM);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> // load the table so we have some data<a name="line.416"></a>
-<span class="sourceLineNo">417</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.417"></a>
-<span class="sourceLineNo">418</span> SnapshotTestingUtils.loadData(UTIL, TABLE2_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> final CountDownLatch toBeSubmitted = new CountDownLatch(ssNum);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> // We'll have one of these per thread<a name="line.421"></a>
-<span class="sourceLineNo">422</span> class SSRunnable implements Runnable {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> SnapshotDescription ss;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> SSRunnable(SnapshotDescription ss) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> this.ss = ss;<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> @Override<a name="line.428"></a>
-<span class="sourceLineNo">429</span> public void run() {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> try {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.431"></a>
-<span class="sourceLineNo">432</span> LOG.info("Submitting snapshot request: " + ClientSnapshotDescriptionUtils.toString(ss));<a name="line.432"></a>
-<span class="sourceLineNo">433</span> admin.takeSnapshotAsync(ss);<a name="line.433"></a>
-<span class="sourceLineNo">434</span> } catch (Exception e) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> LOG.info("Exception during snapshot request: " + ClientSnapshotDescriptionUtils.toString(<a name="line.435"></a>
-<span class="sourceLineNo">436</span> ss)<a name="line.436"></a>
-<span class="sourceLineNo">437</span> + ". This is ok, we expect some", e);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> LOG.info("Submitted snapshot request: " + ClientSnapshotDescriptionUtils.toString(ss));<a name="line.439"></a>
-<span class="sourceLineNo">440</span> toBeSubmitted.countDown();<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span> };<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> // build descriptions<a name="line.444"></a>
-<span class="sourceLineNo">445</span> SnapshotDescription[] descs = new SnapshotDescription[ssNum];<a name="line.445"></a>
-<span class="sourceLineNo">446</span> for (int i = 0; i < ssNum; i++) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> SnapshotDescription.Builder builder = SnapshotDescription.newBuilder();<a name="line.447"></a>
-<span class="sourceLineNo">448</span> builder.setTable(((i % 2) == 0 ? TABLE_NAME : TABLE2_NAME).getNameAsString());<a name="line.448"></a>
-<span class="sourceLineNo">449</span> builder.setName("ss"+i);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> builder.setType(SnapshotDescription.Type.FLUSH);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> descs[i] = builder.build();<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> // kick each off its own thread<a name="line.454"></a>
-<span class="sourceLineNo">455</span> for (int i=0 ; i < ssNum; i++) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> new Thread(new SSRunnable(descs[i])).start();<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span> // wait until all have been submitted<a name="line.459"></a>
-<span class="sourceLineNo">460</span> toBeSubmitted.await();<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span> // loop until all are done.<a name="line.462"></a>
-<span class="sourceLineNo">463</span> while (true) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> int doneCount = 0;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> for (SnapshotDescription ss : descs) {<a name="line.465"></a>
-<span class="sourceLineNo">466</span> try {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> if (admin.isSnapshotFinished(ss)) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> doneCount++;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span> } catch (Exception e) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span> LOG.warn("Got an exception when checking for snapshot " + ss.getName(), e);<a name="line.471"></a>
-<span class="sourceLineNo">472</span> doneCount++;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span> }<a name="line.474"></a>
-<span class="sourceLineNo">475</span> if (doneCount == descs.length) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> break;<a name="line.476"></a>
-<span class="sourceLineNo">477</span> }<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Thread.sleep(100);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span> // dump for debugging<a name="line.481"></a>
-<span class="sourceLineNo">482</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> List<SnapshotDescription> taken = admin.listSnapshots();<a name="line.484"></a>
-<span class="sourceLineNo">485</span> int takenSize = taken.size();<a name="line.485"></a>
-<span class="sourceLineNo">486</span> LOG.info("Taken " + takenSize + " snapshots: " + taken);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> assertTrue("We expect at least 1 request to be rejected because of we concurrently" +<a name="line.487"></a>
-<span class="sourceLineNo">488</span> " issued many requests", takenSize < ssNum && takenSize > 0);<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> // Verify that there's at least one snapshot per table<a name="line.490"></a>
-<span class="sourceLineNo">491</span> int t1SnapshotsCount = 0;<a name="line.491"></a>
-<span class="sourceLineNo">492</span> int t2SnapshotsCount = 0;<a name="line.492"></a>
-<span class="sourceLineNo">493</span> for (SnapshotDescription ss : taken) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span> if (TableName.valueOf(ss.getTable()).equals(TABLE_NAME)) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> t1SnapshotsCount++;<a name="line.495"></a>
-<span class="sourceLineNo">496</span> } else if (TableName.valueOf(ss.getTable()).equals(TABLE2_NAME)) {<a name="line.496"></a>
-<span class="sourceLineNo">497</span> t2SnapshotsCount++;<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span> assertTrue("We expect at least 1 snapshot of table1 ", t1SnapshotsCount > 0);<a name="line.500"></a>
-<span class="sourceLineNo">501</span> assertTrue("We expect at least 1 snapshot of table2 ", t2SnapshotsCount > 0);<a name="line.501"></a>
-<span class="sourceLineNo">502</span><a name="line.502"></a>
-<span class="sourceLineNo">503</span> UTIL.deleteTable(TABLE2_NAME);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> private void waitRegionsAfterMerge(final long numRegionsAfterMerge)<a name="line.506"></a>
-<span class="sourceLineNo">507</span> throws IOException, InterruptedException {<a name="line.507"></a>
-<span class="sourceLineNo">508</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.508"></a>
-<span class="sourceLineNo">509</span> // Verify that there's one region less<a name="line.509"></a>
-<span class="sourceLineNo">510</span> long startTime = System.currentTimeMillis();<a name="line.510"></a>
-<span class="sourceLineNo">511</span> while (admin.getTableRegions(TABLE_NAME).size() != numRegionsAfterMerge) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> // This may be flaky... if after 15sec the merge is not complete give up<a name="line.512"></a>
-<span class="sourceLineNo">513</span> // it will fail in the assertEquals(numRegionsAfterMerge).<a name="line.513"></a>
-<span class="sourceLineNo">514</span> if ((System.currentTimeMillis() - startTime) > 15000)<a name="line.514"></a>
-<span class="sourceLineNo">515</span> break;<a name="line.515"></a>
-<span class="sourceLineNo">516</span> Thread.sleep(100);<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span> SnapshotTestingUtils.waitForTableToBeOnline(UTIL, TABLE_NAME);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
+<span class="sourceLineNo">341</span> // make sure we don't fail on listing snapshots<a name="line.341"></a>
+<span class="sourceLineNo">342</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> // load the table so we have some data<a name="line.343"></a>
+<span class="sourceLineNo">344</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, numRows, TEST_FAM);<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> // Merge two regions<a name="line.346"></a>
+<span class="sourceLineNo">347</span> List<HRegionInfo> regions = admin.getTableRegions(TABLE_NAME);<a name="line.347"></a>
+<span class="sourceLineNo">348</span> Collections.sort(regions, new Comparator<HRegionInfo>() {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> public int compare(HRegionInfo r1, HRegionInfo r2) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> return Bytes.compareTo(r1.getStartKey(), r2.getStartKey());<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
+<span class="sourceLineNo">352</span> });<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> int numRegions = admin.getTableRegions(TABLE_NAME).size();<a name="line.354"></a>
+<span class="sourceLineNo">355</span> int numRegionsAfterMerge = numRegions - 2;<a name="line.355"></a>
+<span class="sourceLineNo">356</span> admin.mergeRegions(regions.get(1).getEncodedNameAsBytes(),<a name="line.356"></a>
+<span class="sourceLineNo">357</span> regions.get(2).getEncodedNameAsBytes(), true);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> admin.mergeRegions(regions.get(5).getEncodedNameAsBytes(),<a name="line.358"></a>
+<span class="sourceLineNo">359</span> regions.get(6).getEncodedNameAsBytes(), true);<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> waitRegionsAfterMerge(numRegionsAfterMerge);<a name="line.361"></a>
+<span class="sourceLineNo">362</span> assertEquals(numRegionsAfterMerge, admin.getTableRegions(TABLE_NAME).size());<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span> // Take a snapshot<a name="line.364"></a>
+<span class="sourceLineNo">365</span> String snapshotName = "snapshotAfterMerge";<a name="line.365"></a>
+<span class="sourceLineNo">366</span> SnapshotTestingUtils.snapshot(admin, snapshotName, TABLE_NAME.getNameAsString(),<a name="line.366"></a>
+<span class="sourceLineNo">367</span> SnapshotDescription.Type.FLUSH, 3);<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span> // Clone the table<a name="line.369"></a>
+<span class="sourceLineNo">370</span> TableName cloneName = TableName.valueOf("cloneMerge");<a name="line.370"></a>
+<span class="sourceLineNo">371</span> admin.cloneSnapshot(snapshotName, cloneName);<a name="line.371"></a>
+<span class="sourceLineNo">372</span> SnapshotTestingUtils.waitForTableToBeOnline(UTIL, cloneName);<a name="line.372"></a>
+<span class="sourceLineNo">373</span><a name="line.373"></a>
+<span class="sourceLineNo">374</span> verifyRowCount(UTIL, TABLE_NAME, numRows);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> verifyRowCount(UTIL, cloneName, numRows);<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> // test that we can delete the snapshot<a name="line.377"></a>
+<span class="sourceLineNo">378</span> UTIL.deleteTable(cloneName);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<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> * Basic end-to-end test of simple-flush-based snapshots<a name="line.382"></a>
+<span class="sourceLineNo">383</span> */<a name="line.383"></a>
+<span class="sourceLineNo">384</span> @Test<a name="line.384"></a>
+<span class="sourceLineNo">385</span> public void testFlushCreateListDestroy() throws Exception {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> LOG.debug("------- Starting Snapshot test -------------");<a name="line.386"></a>
+<span class="sourceLineNo">387</span> // make sure we don't fail on listing snapshots<a name="line.387"></a>
+<span class="sourceLineNo">388</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.388"></a>
+<span class="sourceLineNo">389</span> // load the table so we have some data<a name="line.389"></a>
+<span class="sourceLineNo">390</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> String snapshotName = "flushSnapshotCreateListDestroy";<a name="line.392"></a>
+<span class="sourceLineNo">393</span> FileSystem fs = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getFileSystem();<a name="line.393"></a>
+<span class="sourceLineNo">394</span> Path rootDir = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir();<a name="line.394"></a>
+<span class="sourceLineNo">395</span> SnapshotTestingUtils.createSnapshotAndValidate(admin, TABLE_NAME, Bytes.toString(TEST_FAM),<a name="line.395"></a>
+<span class="sourceLineNo">396</span> snapshotName, rootDir, fs, true);<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span> /**<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * Demonstrate that we reject snapshot requests if there is a snapshot already running on the<a name="line.400"></a>
+<span class="sourceLineNo">401</span> * same table currently running and that concurrent snapshots on different tables can both<a name="line.401"></a>
+<span class="sourceLineNo">402</span> * succeed concurretly.<a name="line.402"></a>
+<span class="sourceLineNo">403</span> */<a name="line.403"></a>
+<span class="sourceLineNo">404</span> @Test<a name="line.404"></a>
+<span class="sourceLineNo">405</span> public void testConcurrentSnapshottingAttempts() throws IOException, InterruptedException {<a name="line.405"></a>
+<span class="sourceLineNo">406</span> final TableName TABLE2_NAME = TableName.valueOf(TABLE_NAME + "2");<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span> int ssNum = 20;<a name="line.408"></a>
+<span class="sourceLineNo">409</span> // make sure we don't fail on listing snapshots<a name="line.409"></a>
+<span class="sourceLineNo">410</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> // create second testing table<a name="line.411"></a>
+<span class="sourceLineNo">412</span> SnapshotTestingUtils.createTable(UTIL, TABLE2_NAME, TEST_FAM);<a name="line.412"></a>
+<span class="sourceLineNo">413</span> // load the table so we have some data<a name="line.413"></a>
+<span class="sourceLineNo">414</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> SnapshotTestingUtils.loadData(UTIL, TABLE2_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span> final CountDownLatch toBeSubmitted = new CountDownLatch(ssNum);<a name="line.417"></a>
+<span class="sourceLineNo">418</span> // We'll have one of these per thread<a name="line.418"></a>
+<span class="sourceLineNo">419</span> class SSRunnable implements Runnable {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> SnapshotDescription ss;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> SSRunnable(SnapshotDescription ss) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> this.ss = ss;<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> @Override<a name="line.425"></a>
+<span class="sourceLineNo">426</span> public void run() {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> try {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> LOG.info("Submitting snapshot request: " + ClientSnapshotDescriptionUtils.toString(ss));<a name="line.428"></a>
+<span class="sourceLineNo">429</span> admin.takeSnapshotAsync(ss);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> } catch (Exception e) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> LOG.info("Exception during snapshot request: " + ClientSnapshotDescriptionUtils.toString(<a name="line.431"></a>
+<span class="sourceLineNo">432</span> ss)<a name="line.432"></a>
+<span class="sourceLineNo">433</span> + ". This is ok, we expect some", e);<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> LOG.info("Submitted snapshot request: " + ClientSnapshotDescriptionUtils.toString(ss));<a name="line.435"></a>
+<span class="sourceLineNo">436</span> toBeSubmitted.countDown();<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><a name="line.439"></a>
+<span class="sourceLineNo">440</span> // build descriptions<a name="line.440"></a>
+<span class="sourceLineNo">441</span> SnapshotDescription[] descs = new SnapshotDescription[ssNum];<a name="line.441"></a>
+<span class="sourceLineNo">442</span> for (int i = 0; i < ssNum; i++) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span> SnapshotDescription.Builder builder = SnapshotDescription.newBuilder();<a name="line.443"></a>
+<span class="sourceLineNo">444</span> builder.setTable(((i % 2) == 0 ? TABLE_NAME : TABLE2_NAME).getNameAsString());<a name="line.444"></a>
+<span class="sourceLineNo">445</span> builder.setName("ss"+i);<a name="line.445"></a>
+<span class="sourceLineNo">446</span> builder.setType(SnapshotDescription.Type.FLUSH);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> descs[i] = builder.build();<a name="line.447"></a>
+<span class="sourceLineNo">448</span> }<a name="line.448"></a>
+<span class="sourceLineNo">449</span><a name="line.449"></a>
+<span class="sourceLineNo">450</span> // kick each off its own thread<a name="line.450"></a>
+<span class="sourceLineNo">451</span> for (int i=0 ; i < ssNum; i++) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> new Thread(new SSRunnable(descs[i])).start();<a name="line.452"></a>
+<span class="sourceLineNo">453</span> }<a name="line.453"></a>
+<span class="sourceLineNo">454</span><a name="line.454"></a>
+<span class="sourceLineNo">455</span> // wait until all have been submitted<a name="line.455"></a>
+<span class="sourceLineNo">456</span> toBeSubmitted.await();<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> // loop until all are done.<a name="line.458"></a>
+<span class="sourceLineNo">459</span> while (true) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> int doneCount = 0;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> for (SnapshotDescription ss : descs) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span> try {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> if (admin.isSnapshotFinished(ss)) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span> doneCount++;<a name="line.464"></a>
+<span class="sourceLineNo">465</span> }<a name="line.465"></a>
+<span class="sourceLineNo">466</span> } catch (Exception e) {<a name="line.466"></a>
+<span class="sourceLineNo">467</span> LOG.warn("Got an exception when checking for snapshot " + ss.getName(), e);<a name="line.467"></a>
+<span class="sourceLineNo">468</span> doneCount++;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> }<a name="line.469"></a>
+<span class="sourceLineNo">470</span> }<a name="line.470"></a>
+<span class="sourceLineNo">471</span> if (doneCount == descs.length) {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> break;<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
+<span class="sourceLineNo">474</span> Thread.sleep(100);<a name="line.474"></a>
+<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">477</span> // dump for debugging<a name="line.477"></a>
+<span class="sourceLineNo">478</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.478"></a>
+<span class="sourceLineNo">479</span><a name="line.479"></a>
+<span class="sourceLineNo">480</span> List<SnapshotDescription> taken = admin.listSnapshots();<a name="line.480"></a>
+<span class="sourceLineNo">481</span> int takenSize = taken.size();<a name="line.481"></a>
+<span class="sourceLineNo">482</span> LOG.info("Taken " + takenSize + " snapshots: " + taken);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> assertTrue("We expect at least 1 request to be rejected because of we concurrently" +<a name="line.483"></a>
+<span class="sourceLineNo">484</span> " issued many requests", takenSize < ssNum && takenSize > 0);<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span> // Verify that there's at least one snapshot per table<a name="line.486"></a>
+<span class="sourceLineNo">487</span> int t1SnapshotsCount = 0;<a name="line.487"></a>
+<span class="sourceLineNo">488</span> int t2SnapshotsCount = 0;<a name="line.488"></a>
+<span class="sourceLineNo">489</span> for (SnapshotDescription ss : taken) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> if (TableName.valueOf(ss.getTable()).equals(TABLE_NAME)) {<a name="line.490"></a>
+<span class="sourceLineNo">491</span> t1SnapshotsCount++;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> } else if (TableName.valueOf(ss.getTable()).equals(TABLE2_NAME)) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> t2SnapshotsCount++;<a name="line.493"></a>
+<span class="sourceLineNo">494</span> }<a name="line.494"></a>
+<span class="sourceLineNo">495</span> }<a name="line.495"></a>
+<span class="sourceLineNo">496</span> assertTrue("We expect at least 1 snapshot of table1 ", t1SnapshotsCount > 0);<a name="line.496"></a>
+<span class="sourceLineNo">497</span> assertTrue("We expect at least 1 snapshot of table2 ", t2SnapshotsCount > 0);<a name="line.497"></a>
+<span class="sourceLineNo">498</span><a name="line.498"></a>
+<span class="sourceLineNo">499</span> UTIL.deleteTable(TABLE2_NAME);<a name="line.499"></a>
+<span class="sourceLineNo">500</span> }<a name="line.500"></a>
+<span class="sourceLineNo">501</span><a name="line.501"></a>
+<span class="sourceLineNo">502</span> private void waitRegionsAfterMerge(final long numRegionsAfterMerge)<a name="line.502"></a>
+<span class="sourceLineNo">503</span> throws IOException, InterruptedException {<a name="line.503"></a>
+<span class="sourceLineNo">504</span> // Verify that there's one region less<a name="line.504"></a>
+<span class="sourceLineNo">505</span> long startTime = System.currentTimeMillis();<a name="line.505"></a>
+<span class="sourceLineNo">506</span> while (admin.getTableRegions(TABLE_NAME).size() != numRegionsAfterMerge) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span> // This may be flaky... if after 15sec the merge is not complete give up<a name="line.507"></a>
+<span class="sourceLineNo">508</span> // it will fail in the assertEquals(numRegionsAfterMerge).<a name="line.508"></a>
+<span class="sourceLineNo">509</span> if ((System.currentTimeMillis() - startTime) > 15000)<a name="line.509"></a>
+<span class="sourceLineNo">510</span> break;<a name="line.510"></a>
+<span class="sourceLineNo">511</span> Thread.sleep(100);<a name="line.511"></a>
+<span class="sourceLineNo">512</span> }<a name="line.512"></a>
+<span class="sourceLineNo">513</span> SnapshotTestingUtils.waitForTableToBeOnline(UTIL, TABLE_NAME);<a name="line.513"></a>
+<span class="sourceLineNo">514</span> }<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span> protected void verifyRowCount(final HBaseTestingUtility util, final TableName tableName,<a name="line.517"></a>
+<span class="sourceLineNo">518</span> long expectedRows) throws IOException {<a name="line.518"></a>
+<span class="sourceLineNo">519</span> SnapshotTestingUtils.verifyRowCount(util, tableName, expectedRows);<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span> protected void verifyRowCount(final HBaseTestingUtility util, final TableName tableName,<a name="line.522"></a>
-<span class="sourceLineNo">523</span> long expectedRows) throws IOException {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> SnapshotTestingUtils.verifyRowCount(util, tableName, expectedRows);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span> protected int countRows(final Table table, final byte[]... families) throws IOException {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> return UTIL.countRows(table, families);<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span>}<a name="line.530"></a>
+<span class="sourceLineNo">522</span> protected int countRows(final Table table, final byte[]... families) throws IOException {<a name="line.522"></a>
+<span class="sourceLineNo">523</span> return UTIL.countRows(table, families);<a name="line.523"></a>
+<span class="sourceLineNo">524</span> }<a name="line.524"></a>
+<span class="sourceLineNo">525</span>}<a name="line.525"></a>
[15/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
index 1724fe5..c9f2d82 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
@@ -67,15 +67,15 @@
<span class="sourceLineNo">059</span> requiredArguments = {<a name="line.59"></a>
<span class="sourceLineNo">060</span> @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
<span class="sourceLineNo">061</span> optionalArguments = {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.63"></a>
+<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.62"></a>
+<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.63"></a>
<span class="sourceLineNo">064</span> @org.jamon.annotations.Argument(name = "frags", type = "Map<String,Integer>"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.65"></a>
-<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.66"></a>
-<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName")})<a name="line.70"></a>
+<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.65"></a>
+<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.66"></a>
+<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.67"></a>
+<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.68"></a>
+<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.69"></a>
+<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>")})<a name="line.70"></a>
<span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
<span class="sourceLineNo">072</span> extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
<span class="sourceLineNo">073</span>{<a name="line.73"></a>
@@ -116,40 +116,40 @@
<span class="sourceLineNo">108</span> return m_master;<a name="line.108"></a>
<span class="sourceLineNo">109</span> }<a name="line.109"></a>
<span class="sourceLineNo">110</span> private HMaster m_master;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // 27, 1<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public void setFormat(String format)<a name="line.112"></a>
+<span class="sourceLineNo">111</span> // 22, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public void setMetaLocation(ServerName metaLocation)<a name="line.112"></a>
<span class="sourceLineNo">113</span> {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> // 27, 1<a name="line.114"></a>
-<span class="sourceLineNo">115</span> m_format = format;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> m_format__IsNotDefault = true;<a name="line.116"></a>
+<span class="sourceLineNo">114</span> // 22, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span> m_metaLocation = metaLocation;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> m_metaLocation__IsNotDefault = true;<a name="line.116"></a>
<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public String getFormat()<a name="line.118"></a>
+<span class="sourceLineNo">118</span> public ServerName getMetaLocation()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_format;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_metaLocation;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private String m_format;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public boolean getFormat__IsNotDefault()<a name="line.123"></a>
+<span class="sourceLineNo">122</span> private ServerName m_metaLocation;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public boolean getMetaLocation__IsNotDefault()<a name="line.123"></a>
<span class="sourceLineNo">124</span> {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return m_format__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span> return m_metaLocation__IsNotDefault;<a name="line.125"></a>
<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span> private boolean m_format__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> // 25, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.129"></a>
+<span class="sourceLineNo">127</span> private boolean m_metaLocation__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> // 28, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public void setServerManager(ServerManager serverManager)<a name="line.129"></a>
<span class="sourceLineNo">130</span> {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> // 25, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span> m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span> // 28, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span> m_serverManager = serverManager;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> m_serverManager__IsNotDefault = true;<a name="line.133"></a>
<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public boolean getCatalogJanitorEnabled()<a name="line.135"></a>
+<span class="sourceLineNo">135</span> public ServerManager getServerManager()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_catalogJanitorEnabled;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_serverManager;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private boolean m_catalogJanitorEnabled;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span> private ServerManager m_serverManager;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public boolean getServerManager__IsNotDefault()<a name="line.140"></a>
<span class="sourceLineNo">141</span> {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span> return m_serverManager__IsNotDefault;<a name="line.142"></a>
<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">144</span> private boolean m_serverManager__IsNotDefault;<a name="line.144"></a>
<span class="sourceLineNo">145</span> // 21, 1<a name="line.145"></a>
<span class="sourceLineNo">146</span> public void setFrags(Map<String,Integer> frags)<a name="line.146"></a>
<span class="sourceLineNo">147</span> {<a name="line.147"></a>
@@ -167,108 +167,108 @@
<span class="sourceLineNo">159</span> return m_frags__IsNotDefault;<a name="line.159"></a>
<span class="sourceLineNo">160</span> }<a name="line.160"></a>
<span class="sourceLineNo">161</span> private boolean m_frags__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> // 26, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void setFilter(String filter)<a name="line.163"></a>
+<span class="sourceLineNo">162</span> // 29, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.163"></a>
<span class="sourceLineNo">164</span> {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> // 26, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span> m_filter = filter;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> m_filter__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span> // 29, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span> m_assignmentManager = assignmentManager;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> m_assignmentManager__IsNotDefault = true;<a name="line.167"></a>
<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public String getFilter()<a name="line.169"></a>
+<span class="sourceLineNo">169</span> public AssignmentManager getAssignmentManager()<a name="line.169"></a>
<span class="sourceLineNo">170</span> {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> return m_filter;<a name="line.171"></a>
+<span class="sourceLineNo">171</span> return m_assignmentManager;<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> private String m_filter;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public boolean getFilter__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span> private AssignmentManager m_assignmentManager;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.174"></a>
<span class="sourceLineNo">175</span> {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return m_filter__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span> return m_assignmentManager__IsNotDefault;<a name="line.176"></a>
<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> private boolean m_filter__IsNotDefault;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> // 29, 1<a name="line.179"></a>
-<span class="sourceLineNo">180</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.180"></a>
+<span class="sourceLineNo">178</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // 27, 1<a name="line.179"></a>
+<span class="sourceLineNo">180</span> public void setFormat(String format)<a name="line.180"></a>
<span class="sourceLineNo">181</span> {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // 29, 1<a name="line.182"></a>
-<span class="sourceLineNo">183</span> m_assignmentManager = assignmentManager;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> m_assignmentManager__IsNotDefault = true;<a name="line.184"></a>
+<span class="sourceLineNo">182</span> // 27, 1<a name="line.182"></a>
+<span class="sourceLineNo">183</span> m_format = format;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> m_format__IsNotDefault = true;<a name="line.184"></a>
<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> public AssignmentManager getAssignmentManager()<a name="line.186"></a>
+<span class="sourceLineNo">186</span> public String getFormat()<a name="line.186"></a>
<span class="sourceLineNo">187</span> {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return m_assignmentManager;<a name="line.188"></a>
+<span class="sourceLineNo">188</span> return m_format;<a name="line.188"></a>
<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> private AssignmentManager m_assignmentManager;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.191"></a>
+<span class="sourceLineNo">190</span> private String m_format;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public boolean getFormat__IsNotDefault()<a name="line.191"></a>
<span class="sourceLineNo">192</span> {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> return m_assignmentManager__IsNotDefault;<a name="line.193"></a>
+<span class="sourceLineNo">193</span> return m_format__IsNotDefault;<a name="line.193"></a>
<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // 28, 1<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public void setServerManager(ServerManager serverManager)<a name="line.197"></a>
+<span class="sourceLineNo">195</span> private boolean m_format__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // 25, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.197"></a>
<span class="sourceLineNo">198</span> {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> // 28, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span> m_serverManager = serverManager;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> m_serverManager__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span> // 25, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span> m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public ServerManager getServerManager()<a name="line.203"></a>
+<span class="sourceLineNo">203</span> public boolean getCatalogJanitorEnabled()<a name="line.203"></a>
<span class="sourceLineNo">204</span> {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> return m_serverManager;<a name="line.205"></a>
+<span class="sourceLineNo">205</span> return m_catalogJanitorEnabled;<a name="line.205"></a>
<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> private ServerManager m_serverManager;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public boolean getServerManager__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span> private boolean m_catalogJanitorEnabled;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.208"></a>
<span class="sourceLineNo">209</span> {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return m_serverManager__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.210"></a>
<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> private boolean m_serverManager__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> // 24, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.214"></a>
+<span class="sourceLineNo">212</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // 26, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span> public void setFilter(String filter)<a name="line.214"></a>
<span class="sourceLineNo">215</span> {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> // 24, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span> m_deadServers = deadServers;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> m_deadServers__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span> // 26, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span> m_filter = filter;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> m_filter__IsNotDefault = true;<a name="line.218"></a>
<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public Set<ServerName> getDeadServers()<a name="line.220"></a>
+<span class="sourceLineNo">220</span> public String getFilter()<a name="line.220"></a>
<span class="sourceLineNo">221</span> {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return m_deadServers;<a name="line.222"></a>
+<span class="sourceLineNo">222</span> return m_filter;<a name="line.222"></a>
<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> private Set<ServerName> m_deadServers;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public boolean getDeadServers__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span> private String m_filter;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public boolean getFilter__IsNotDefault()<a name="line.225"></a>
<span class="sourceLineNo">226</span> {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return m_deadServers__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span> return m_filter__IsNotDefault;<a name="line.227"></a>
<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> private boolean m_deadServers__IsNotDefault;<a name="line.229"></a>
-<span class="sourceLineNo">230</span> // 23, 1<a name="line.230"></a>
-<span class="sourceLineNo">231</span> public void setServers(List<ServerName> servers)<a name="line.231"></a>
+<span class="sourceLineNo">229</span> private boolean m_filter__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // 24, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.231"></a>
<span class="sourceLineNo">232</span> {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> // 23, 1<a name="line.233"></a>
-<span class="sourceLineNo">234</span> m_servers = servers;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> m_servers__IsNotDefault = true;<a name="line.235"></a>
+<span class="sourceLineNo">233</span> // 24, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span> m_deadServers = deadServers;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> m_deadServers__IsNotDefault = true;<a name="line.235"></a>
<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public List<ServerName> getServers()<a name="line.237"></a>
+<span class="sourceLineNo">237</span> public Set<ServerName> getDeadServers()<a name="line.237"></a>
<span class="sourceLineNo">238</span> {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return m_servers;<a name="line.239"></a>
+<span class="sourceLineNo">239</span> return m_deadServers;<a name="line.239"></a>
<span class="sourceLineNo">240</span> }<a name="line.240"></a>
-<span class="sourceLineNo">241</span> private List<ServerName> m_servers;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> public boolean getServers__IsNotDefault()<a name="line.242"></a>
+<span class="sourceLineNo">241</span> private Set<ServerName> m_deadServers;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> public boolean getDeadServers__IsNotDefault()<a name="line.242"></a>
<span class="sourceLineNo">243</span> {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> return m_servers__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span> return m_deadServers__IsNotDefault;<a name="line.244"></a>
<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> private boolean m_servers__IsNotDefault;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> // 22, 1<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public void setMetaLocation(ServerName metaLocation)<a name="line.248"></a>
+<span class="sourceLineNo">246</span> private boolean m_deadServers__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> // 23, 1<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public void setServers(List<ServerName> servers)<a name="line.248"></a>
<span class="sourceLineNo">249</span> {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // 22, 1<a name="line.250"></a>
-<span class="sourceLineNo">251</span> m_metaLocation = metaLocation;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> m_metaLocation__IsNotDefault = true;<a name="line.252"></a>
+<span class="sourceLineNo">250</span> // 23, 1<a name="line.250"></a>
+<span class="sourceLineNo">251</span> m_servers = servers;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> m_servers__IsNotDefault = true;<a name="line.252"></a>
<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> public ServerName getMetaLocation()<a name="line.254"></a>
+<span class="sourceLineNo">254</span> public List<ServerName> getServers()<a name="line.254"></a>
<span class="sourceLineNo">255</span> {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m_metaLocation;<a name="line.256"></a>
+<span class="sourceLineNo">256</span> return m_servers;<a name="line.256"></a>
<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> private ServerName m_metaLocation;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public boolean getMetaLocation__IsNotDefault()<a name="line.259"></a>
+<span class="sourceLineNo">258</span> private List<ServerName> m_servers;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public boolean getServers__IsNotDefault()<a name="line.259"></a>
<span class="sourceLineNo">260</span> {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return m_metaLocation__IsNotDefault;<a name="line.261"></a>
+<span class="sourceLineNo">261</span> return m_servers__IsNotDefault;<a name="line.261"></a>
<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> private boolean m_metaLocation__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span> private boolean m_servers__IsNotDefault;<a name="line.263"></a>
<span class="sourceLineNo">264</span> }<a name="line.264"></a>
<span class="sourceLineNo">265</span> @Override<a name="line.265"></a>
<span class="sourceLineNo">266</span> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.266"></a>
@@ -280,17 +280,17 @@
<span class="sourceLineNo">272</span> return (ImplData) super.getImplData();<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> protected String format;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.276"></a>
+<span class="sourceLineNo">275</span> protected ServerName metaLocation;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.276"></a>
<span class="sourceLineNo">277</span> {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> (getImplData()).setFormat(p_format);<a name="line.278"></a>
+<span class="sourceLineNo">278</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.278"></a>
<span class="sourceLineNo">279</span> return this;<a name="line.279"></a>
<span class="sourceLineNo">280</span> }<a name="line.280"></a>
<span class="sourceLineNo">281</span> <a name="line.281"></a>
-<span class="sourceLineNo">282</span> protected boolean catalogJanitorEnabled;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.283"></a>
+<span class="sourceLineNo">282</span> protected ServerManager serverManager;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.283"></a>
<span class="sourceLineNo">284</span> {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.285"></a>
+<span class="sourceLineNo">285</span> (getImplData()).setServerManager(p_serverManager);<a name="line.285"></a>
<span class="sourceLineNo">286</span> return this;<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>
@@ -301,45 +301,45 @@
<span class="sourceLineNo">293</span> return this;<a name="line.293"></a>
<span class="sourceLineNo">294</span> }<a name="line.294"></a>
<span class="sourceLineNo">295</span> <a name="line.295"></a>
-<span class="sourceLineNo">296</span> protected String filter;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.297"></a>
+<span class="sourceLineNo">296</span> protected AssignmentManager assignmentManager;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.297"></a>
<span class="sourceLineNo">298</span> {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> (getImplData()).setFilter(p_filter);<a name="line.299"></a>
+<span class="sourceLineNo">299</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.299"></a>
<span class="sourceLineNo">300</span> return this;<a name="line.300"></a>
<span class="sourceLineNo">301</span> }<a name="line.301"></a>
<span class="sourceLineNo">302</span> <a name="line.302"></a>
-<span class="sourceLineNo">303</span> protected AssignmentManager assignmentManager;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.304"></a>
+<span class="sourceLineNo">303</span> protected String format;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.304"></a>
<span class="sourceLineNo">305</span> {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.306"></a>
+<span class="sourceLineNo">306</span> (getImplData()).setFormat(p_format);<a name="line.306"></a>
<span class="sourceLineNo">307</span> return this;<a name="line.307"></a>
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
<span class="sourceLineNo">309</span> <a name="line.309"></a>
-<span class="sourceLineNo">310</span> protected ServerManager serverManager;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.311"></a>
+<span class="sourceLineNo">310</span> protected boolean catalogJanitorEnabled;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.311"></a>
<span class="sourceLineNo">312</span> {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> (getImplData()).setServerManager(p_serverManager);<a name="line.313"></a>
+<span class="sourceLineNo">313</span> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.313"></a>
<span class="sourceLineNo">314</span> return this;<a name="line.314"></a>
<span class="sourceLineNo">315</span> }<a name="line.315"></a>
<span class="sourceLineNo">316</span> <a name="line.316"></a>
-<span class="sourceLineNo">317</span> protected Set<ServerName> deadServers;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.318"></a>
+<span class="sourceLineNo">317</span> protected String filter;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.318"></a>
<span class="sourceLineNo">319</span> {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.320"></a>
+<span class="sourceLineNo">320</span> (getImplData()).setFilter(p_filter);<a name="line.320"></a>
<span class="sourceLineNo">321</span> return this;<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> protected List<ServerName> servers;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.325"></a>
+<span class="sourceLineNo">324</span> protected Set<ServerName> deadServers;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.325"></a>
<span class="sourceLineNo">326</span> {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> (getImplData()).setServers(p_servers);<a name="line.327"></a>
+<span class="sourceLineNo">327</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.327"></a>
<span class="sourceLineNo">328</span> return this;<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> protected ServerName metaLocation;<a name="line.331"></a>
-<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.332"></a>
+<span class="sourceLineNo">331</span> protected List<ServerName> servers;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.332"></a>
<span class="sourceLineNo">333</span> {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.334"></a>
+<span class="sourceLineNo">334</span> (getImplData()).setServers(p_servers);<a name="line.334"></a>
<span class="sourceLineNo">335</span> return this;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
index b0b10e6..5014c4f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
@@ -68,15 +68,15 @@
<span class="sourceLineNo">060</span><a name="line.60"></a>
<span class="sourceLineNo">061</span>{<a name="line.61"></a>
<span class="sourceLineNo">062</span> private final HMaster master;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> private final String format;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> private final boolean catalogJanitorEnabled;<a name="line.64"></a>
+<span class="sourceLineNo">063</span> private final ServerName metaLocation;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> private final ServerManager serverManager;<a name="line.64"></a>
<span class="sourceLineNo">065</span> private final Map<String,Integer> frags;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> private final String filter;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> private final AssignmentManager assignmentManager;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> private final ServerManager serverManager;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> private final Set<ServerName> deadServers;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> private final List<ServerName> servers;<a name="line.70"></a>
-<span class="sourceLineNo">071</span> private final ServerName metaLocation;<a name="line.71"></a>
+<span class="sourceLineNo">066</span> private final AssignmentManager assignmentManager;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private final String format;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> private final boolean catalogJanitorEnabled;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> private final String filter;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> private final Set<ServerName> deadServers;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private final List<ServerName> servers;<a name="line.71"></a>
<span class="sourceLineNo">072</span> // 68, 1<a name="line.72"></a>
<span class="sourceLineNo">073</span> <a name="line.73"></a>
<span class="sourceLineNo">074</span> public String formatZKString() {<a name="line.74"></a>
@@ -106,41 +106,41 @@
<span class="sourceLineNo">098</span><a name="line.98"></a>
<span class="sourceLineNo">099</span> protected static org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData p_implData)<a name="line.99"></a>
<span class="sourceLineNo">100</span> {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> if(! p_implData.getFormat__IsNotDefault())<a name="line.101"></a>
+<span class="sourceLineNo">101</span> if(! p_implData.getMetaLocation__IsNotDefault())<a name="line.101"></a>
<span class="sourceLineNo">102</span> {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> p_implData.setFormat("html");<a name="line.103"></a>
+<span class="sourceLineNo">103</span> p_implData.setMetaLocation(null);<a name="line.103"></a>
<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> if(! p_implData.getCatalogJanitorEnabled__IsNotDefault())<a name="line.105"></a>
+<span class="sourceLineNo">105</span> if(! p_implData.getServerManager__IsNotDefault())<a name="line.105"></a>
<span class="sourceLineNo">106</span> {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> p_implData.setCatalogJanitorEnabled(true);<a name="line.107"></a>
+<span class="sourceLineNo">107</span> p_implData.setServerManager(null);<a name="line.107"></a>
<span class="sourceLineNo">108</span> }<a name="line.108"></a>
<span class="sourceLineNo">109</span> if(! p_implData.getFrags__IsNotDefault())<a name="line.109"></a>
<span class="sourceLineNo">110</span> {<a name="line.110"></a>
<span class="sourceLineNo">111</span> p_implData.setFrags(null);<a name="line.111"></a>
<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if(! p_implData.getFilter__IsNotDefault())<a name="line.113"></a>
+<span class="sourceLineNo">113</span> if(! p_implData.getAssignmentManager__IsNotDefault())<a name="line.113"></a>
<span class="sourceLineNo">114</span> {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> p_implData.setFilter("general");<a name="line.115"></a>
+<span class="sourceLineNo">115</span> p_implData.setAssignmentManager(null);<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> if(! p_implData.getAssignmentManager__IsNotDefault())<a name="line.117"></a>
+<span class="sourceLineNo">117</span> if(! p_implData.getFormat__IsNotDefault())<a name="line.117"></a>
<span class="sourceLineNo">118</span> {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> p_implData.setAssignmentManager(null);<a name="line.119"></a>
+<span class="sourceLineNo">119</span> p_implData.setFormat("html");<a name="line.119"></a>
<span class="sourceLineNo">120</span> }<a name="line.120"></a>
-<span class="sourceLineNo">121</span> if(! p_implData.getServerManager__IsNotDefault())<a name="line.121"></a>
+<span class="sourceLineNo">121</span> if(! p_implData.getCatalogJanitorEnabled__IsNotDefault())<a name="line.121"></a>
<span class="sourceLineNo">122</span> {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> p_implData.setServerManager(null);<a name="line.123"></a>
+<span class="sourceLineNo">123</span> p_implData.setCatalogJanitorEnabled(true);<a name="line.123"></a>
<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span> if(! p_implData.getDeadServers__IsNotDefault())<a name="line.125"></a>
+<span class="sourceLineNo">125</span> if(! p_implData.getFilter__IsNotDefault())<a name="line.125"></a>
<span class="sourceLineNo">126</span> {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> p_implData.setDeadServers(null);<a name="line.127"></a>
+<span class="sourceLineNo">127</span> p_implData.setFilter("general");<a name="line.127"></a>
<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span> if(! p_implData.getServers__IsNotDefault())<a name="line.129"></a>
+<span class="sourceLineNo">129</span> if(! p_implData.getDeadServers__IsNotDefault())<a name="line.129"></a>
<span class="sourceLineNo">130</span> {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> p_implData.setServers(null);<a name="line.131"></a>
+<span class="sourceLineNo">131</span> p_implData.setDeadServers(null);<a name="line.131"></a>
<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span> if(! p_implData.getMetaLocation__IsNotDefault())<a name="line.133"></a>
+<span class="sourceLineNo">133</span> if(! p_implData.getServers__IsNotDefault())<a name="line.133"></a>
<span class="sourceLineNo">134</span> {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> p_implData.setMetaLocation(null);<a name="line.135"></a>
+<span class="sourceLineNo">135</span> p_implData.setServers(null);<a name="line.135"></a>
<span class="sourceLineNo">136</span> }<a name="line.136"></a>
<span class="sourceLineNo">137</span> return p_implData;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
@@ -148,15 +148,15 @@
<span class="sourceLineNo">140</span> {<a name="line.140"></a>
<span class="sourceLineNo">141</span> super(p_templateManager, __jamon_setOptionalArguments(p_implData));<a name="line.141"></a>
<span class="sourceLineNo">142</span> master = p_implData.getMaster();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> format = p_implData.getFormat();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> catalogJanitorEnabled = p_implData.getCatalogJanitorEnabled();<a name="line.144"></a>
+<span class="sourceLineNo">143</span> metaLocation = p_implData.getMetaLocation();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> serverManager = p_implData.getServerManager();<a name="line.144"></a>
<span class="sourceLineNo">145</span> frags = p_implData.getFrags();<a name="line.145"></a>
-<span class="sourceLineNo">146</span> filter = p_implData.getFilter();<a name="line.146"></a>
-<span class="sourceLineNo">147</span> assignmentManager = p_implData.getAssignmentManager();<a name="line.147"></a>
-<span class="sourceLineNo">148</span> serverManager = p_implData.getServerManager();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> deadServers = p_implData.getDeadServers();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> servers = p_implData.getServers();<a name="line.150"></a>
-<span class="sourceLineNo">151</span> metaLocation = p_implData.getMetaLocation();<a name="line.151"></a>
+<span class="sourceLineNo">146</span> assignmentManager = p_implData.getAssignmentManager();<a name="line.146"></a>
+<span class="sourceLineNo">147</span> format = p_implData.getFormat();<a name="line.147"></a>
+<span class="sourceLineNo">148</span> catalogJanitorEnabled = p_implData.getCatalogJanitorEnabled();<a name="line.148"></a>
+<span class="sourceLineNo">149</span> filter = p_implData.getFilter();<a name="line.149"></a>
+<span class="sourceLineNo">150</span> deadServers = p_implData.getDeadServers();<a name="line.150"></a>
+<span class="sourceLineNo">151</span> servers = p_implData.getServers();<a name="line.151"></a>
<span class="sourceLineNo">152</span> }<a name="line.152"></a>
<span class="sourceLineNo">153</span> <a name="line.153"></a>
<span class="sourceLineNo">154</span> @Override public void renderNoFlush(final java.io.Writer jamonWriter)<a name="line.154"></a>
@@ -170,8 +170,8 @@
<span class="sourceLineNo">162</span> // 60, 3<a name="line.162"></a>
<span class="sourceLineNo">163</span> {<a name="line.163"></a>
<span class="sourceLineNo">164</span> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl __jamon__var_6 = new org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl(this.getTemplateManager());<a name="line.164"></a>
-<span class="sourceLineNo">165</span> __jamon__var_6.setFormat("json" );<a name="line.165"></a>
-<span class="sourceLineNo">166</span> __jamon__var_6.setFilter(filter);<a name="line.166"></a>
+<span class="sourceLineNo">165</span> __jamon__var_6.setFilter(filter);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> __jamon__var_6.setFormat("json" );<a name="line.166"></a>
<span class="sourceLineNo">167</span> __jamon__var_6.renderNoFlush(jamonWriter);<a name="line.167"></a>
<span class="sourceLineNo">168</span> }<a name="line.168"></a>
<span class="sourceLineNo">169</span> // 60, 68<a name="line.169"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
index 46c00c7..f1ce24d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
@@ -33,10 +33,10 @@
<span class="sourceLineNo">025</span> requiredArguments = {<a name="line.25"></a>
<span class="sourceLineNo">026</span> @org.jamon.annotations.Argument(name = "regionServer", type = "HRegionServer")},<a name="line.26"></a>
<span class="sourceLineNo">027</span> optionalArguments = {<a name="line.27"></a>
-<span class="sourceLineNo">028</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.28"></a>
-<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.29"></a>
-<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.30"></a>
-<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "bcn", type = "String")})<a name="line.31"></a>
+<span class="sourceLineNo">028</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.28"></a>
+<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.29"></a>
+<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "bcn", type = "String"),<a name="line.30"></a>
+<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "format", type = "String")})<a name="line.31"></a>
<span class="sourceLineNo">032</span>public class RSStatusTmpl<a name="line.32"></a>
<span class="sourceLineNo">033</span> extends org.jamon.AbstractTemplateProxy<a name="line.33"></a>
<span class="sourceLineNo">034</span>{<a name="line.34"></a>
@@ -77,74 +77,74 @@
<span class="sourceLineNo">069</span> return m_regionServer;<a name="line.69"></a>
<span class="sourceLineNo">070</span> }<a name="line.70"></a>
<span class="sourceLineNo">071</span> private HRegionServer m_regionServer;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> // 22, 1<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public void setFormat(String format)<a name="line.73"></a>
+<span class="sourceLineNo">072</span> // 21, 1<a name="line.72"></a>
+<span class="sourceLineNo">073</span> public void setFilter(String filter)<a name="line.73"></a>
<span class="sourceLineNo">074</span> {<a name="line.74"></a>
-<span class="sourceLineNo">075</span> // 22, 1<a name="line.75"></a>
-<span class="sourceLineNo">076</span> m_format = format;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> m_format__IsNotDefault = true;<a name="line.77"></a>
+<span class="sourceLineNo">075</span> // 21, 1<a name="line.75"></a>
+<span class="sourceLineNo">076</span> m_filter = filter;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> m_filter__IsNotDefault = true;<a name="line.77"></a>
<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span> public String getFormat()<a name="line.79"></a>
+<span class="sourceLineNo">079</span> public String getFilter()<a name="line.79"></a>
<span class="sourceLineNo">080</span> {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return m_format;<a name="line.81"></a>
+<span class="sourceLineNo">081</span> return m_filter;<a name="line.81"></a>
<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private String m_format;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> public boolean getFormat__IsNotDefault()<a name="line.84"></a>
+<span class="sourceLineNo">083</span> private String m_filter;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> public boolean getFilter__IsNotDefault()<a name="line.84"></a>
<span class="sourceLineNo">085</span> {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> return m_format__IsNotDefault;<a name="line.86"></a>
+<span class="sourceLineNo">086</span> return m_filter__IsNotDefault;<a name="line.86"></a>
<span class="sourceLineNo">087</span> }<a name="line.87"></a>
-<span class="sourceLineNo">088</span> private boolean m_format__IsNotDefault;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // 21, 1<a name="line.89"></a>
-<span class="sourceLineNo">090</span> public void setFilter(String filter)<a name="line.90"></a>
+<span class="sourceLineNo">088</span> private boolean m_filter__IsNotDefault;<a name="line.88"></a>
+<span class="sourceLineNo">089</span> // 24, 1<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public void setBcv(String bcv)<a name="line.90"></a>
<span class="sourceLineNo">091</span> {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // 21, 1<a name="line.92"></a>
-<span class="sourceLineNo">093</span> m_filter = filter;<a name="line.93"></a>
-<span class="sourceLineNo">094</span> m_filter__IsNotDefault = true;<a name="line.94"></a>
+<span class="sourceLineNo">092</span> // 24, 1<a name="line.92"></a>
+<span class="sourceLineNo">093</span> m_bcv = bcv;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> m_bcv__IsNotDefault = true;<a name="line.94"></a>
<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public String getFilter()<a name="line.96"></a>
+<span class="sourceLineNo">096</span> public String getBcv()<a name="line.96"></a>
<span class="sourceLineNo">097</span> {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> return m_filter;<a name="line.98"></a>
+<span class="sourceLineNo">098</span> return m_bcv;<a name="line.98"></a>
<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> private String m_filter;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public boolean getFilter__IsNotDefault()<a name="line.101"></a>
+<span class="sourceLineNo">100</span> private String m_bcv;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> public boolean getBcv__IsNotDefault()<a name="line.101"></a>
<span class="sourceLineNo">102</span> {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return m_filter__IsNotDefault;<a name="line.103"></a>
+<span class="sourceLineNo">103</span> return m_bcv__IsNotDefault;<a name="line.103"></a>
<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> private boolean m_filter__IsNotDefault;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> // 24, 1<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public void setBcv(String bcv)<a name="line.107"></a>
+<span class="sourceLineNo">105</span> private boolean m_bcv__IsNotDefault;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> // 23, 1<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public void setBcn(String bcn)<a name="line.107"></a>
<span class="sourceLineNo">108</span> {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> // 24, 1<a name="line.109"></a>
-<span class="sourceLineNo">110</span> m_bcv = bcv;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> m_bcv__IsNotDefault = true;<a name="line.111"></a>
+<span class="sourceLineNo">109</span> // 23, 1<a name="line.109"></a>
+<span class="sourceLineNo">110</span> m_bcn = bcn;<a name="line.110"></a>
+<span class="sourceLineNo">111</span> m_bcn__IsNotDefault = true;<a name="line.111"></a>
<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> public String getBcv()<a name="line.113"></a>
+<span class="sourceLineNo">113</span> public String getBcn()<a name="line.113"></a>
<span class="sourceLineNo">114</span> {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return m_bcv;<a name="line.115"></a>
+<span class="sourceLineNo">115</span> return m_bcn;<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private String m_bcv;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public boolean getBcv__IsNotDefault()<a name="line.118"></a>
+<span class="sourceLineNo">117</span> private String m_bcn;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public boolean getBcn__IsNotDefault()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_bcv__IsNotDefault;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_bcn__IsNotDefault;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private boolean m_bcv__IsNotDefault;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> // 23, 1<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public void setBcn(String bcn)<a name="line.124"></a>
+<span class="sourceLineNo">122</span> private boolean m_bcn__IsNotDefault;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> // 22, 1<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public void setFormat(String format)<a name="line.124"></a>
<span class="sourceLineNo">125</span> {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> // 23, 1<a name="line.126"></a>
-<span class="sourceLineNo">127</span> m_bcn = bcn;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> m_bcn__IsNotDefault = true;<a name="line.128"></a>
+<span class="sourceLineNo">126</span> // 22, 1<a name="line.126"></a>
+<span class="sourceLineNo">127</span> m_format = format;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> m_format__IsNotDefault = true;<a name="line.128"></a>
<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span> public String getBcn()<a name="line.130"></a>
+<span class="sourceLineNo">130</span> public String getFormat()<a name="line.130"></a>
<span class="sourceLineNo">131</span> {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return m_bcn;<a name="line.132"></a>
+<span class="sourceLineNo">132</span> return m_format;<a name="line.132"></a>
<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> private String m_bcn;<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public boolean getBcn__IsNotDefault()<a name="line.135"></a>
+<span class="sourceLineNo">134</span> private String m_format;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> public boolean getFormat__IsNotDefault()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_bcn__IsNotDefault;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_format__IsNotDefault;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private boolean m_bcn__IsNotDefault;<a name="line.139"></a>
+<span class="sourceLineNo">139</span> private boolean m_format__IsNotDefault;<a name="line.139"></a>
<span class="sourceLineNo">140</span> }<a name="line.140"></a>
<span class="sourceLineNo">141</span> @Override<a name="line.141"></a>
<span class="sourceLineNo">142</span> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.142"></a>
@@ -156,31 +156,31 @@
<span class="sourceLineNo">148</span> return (ImplData) super.getImplData();<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> protected String format;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.152"></a>
+<span class="sourceLineNo">151</span> protected String filter;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.152"></a>
<span class="sourceLineNo">153</span> {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> (getImplData()).setFormat(p_format);<a name="line.154"></a>
+<span class="sourceLineNo">154</span> (getImplData()).setFilter(p_filter);<a name="line.154"></a>
<span class="sourceLineNo">155</span> return this;<a name="line.155"></a>
<span class="sourceLineNo">156</span> }<a name="line.156"></a>
<span class="sourceLineNo">157</span> <a name="line.157"></a>
-<span class="sourceLineNo">158</span> protected String filter;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.159"></a>
+<span class="sourceLineNo">158</span> protected String bcv;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.159"></a>
<span class="sourceLineNo">160</span> {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> (getImplData()).setFilter(p_filter);<a name="line.161"></a>
+<span class="sourceLineNo">161</span> (getImplData()).setBcv(p_bcv);<a name="line.161"></a>
<span class="sourceLineNo">162</span> return this;<a name="line.162"></a>
<span class="sourceLineNo">163</span> }<a name="line.163"></a>
<span class="sourceLineNo">164</span> <a name="line.164"></a>
-<span class="sourceLineNo">165</span> protected String bcv;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.166"></a>
+<span class="sourceLineNo">165</span> protected String bcn;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.166"></a>
<span class="sourceLineNo">167</span> {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> (getImplData()).setBcv(p_bcv);<a name="line.168"></a>
+<span class="sourceLineNo">168</span> (getImplData()).setBcn(p_bcn);<a name="line.168"></a>
<span class="sourceLineNo">169</span> return this;<a name="line.169"></a>
<span class="sourceLineNo">170</span> }<a name="line.170"></a>
<span class="sourceLineNo">171</span> <a name="line.171"></a>
-<span class="sourceLineNo">172</span> protected String bcn;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.173"></a>
+<span class="sourceLineNo">172</span> protected String format;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.173"></a>
<span class="sourceLineNo">174</span> {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> (getImplData()).setBcn(p_bcn);<a name="line.175"></a>
+<span class="sourceLineNo">175</span> (getImplData()).setFormat(p_format);<a name="line.175"></a>
<span class="sourceLineNo">176</span> return this;<a name="line.176"></a>
<span class="sourceLineNo">177</span> }<a name="line.177"></a>
<span class="sourceLineNo">178</span> <a name="line.178"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
index 46c00c7..f1ce24d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
@@ -33,10 +33,10 @@
<span class="sourceLineNo">025</span> requiredArguments = {<a name="line.25"></a>
<span class="sourceLineNo">026</span> @org.jamon.annotations.Argument(name = "regionServer", type = "HRegionServer")},<a name="line.26"></a>
<span class="sourceLineNo">027</span> optionalArguments = {<a name="line.27"></a>
-<span class="sourceLineNo">028</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.28"></a>
-<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.29"></a>
-<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.30"></a>
-<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "bcn", type = "String")})<a name="line.31"></a>
+<span class="sourceLineNo">028</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.28"></a>
+<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.29"></a>
+<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "bcn", type = "String"),<a name="line.30"></a>
+<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "format", type = "String")})<a name="line.31"></a>
<span class="sourceLineNo">032</span>public class RSStatusTmpl<a name="line.32"></a>
<span class="sourceLineNo">033</span> extends org.jamon.AbstractTemplateProxy<a name="line.33"></a>
<span class="sourceLineNo">034</span>{<a name="line.34"></a>
@@ -77,74 +77,74 @@
<span class="sourceLineNo">069</span> return m_regionServer;<a name="line.69"></a>
<span class="sourceLineNo">070</span> }<a name="line.70"></a>
<span class="sourceLineNo">071</span> private HRegionServer m_regionServer;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> // 22, 1<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public void setFormat(String format)<a name="line.73"></a>
+<span class="sourceLineNo">072</span> // 21, 1<a name="line.72"></a>
+<span class="sourceLineNo">073</span> public void setFilter(String filter)<a name="line.73"></a>
<span class="sourceLineNo">074</span> {<a name="line.74"></a>
-<span class="sourceLineNo">075</span> // 22, 1<a name="line.75"></a>
-<span class="sourceLineNo">076</span> m_format = format;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> m_format__IsNotDefault = true;<a name="line.77"></a>
+<span class="sourceLineNo">075</span> // 21, 1<a name="line.75"></a>
+<span class="sourceLineNo">076</span> m_filter = filter;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> m_filter__IsNotDefault = true;<a name="line.77"></a>
<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span> public String getFormat()<a name="line.79"></a>
+<span class="sourceLineNo">079</span> public String getFilter()<a name="line.79"></a>
<span class="sourceLineNo">080</span> {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return m_format;<a name="line.81"></a>
+<span class="sourceLineNo">081</span> return m_filter;<a name="line.81"></a>
<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private String m_format;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> public boolean getFormat__IsNotDefault()<a name="line.84"></a>
+<span class="sourceLineNo">083</span> private String m_filter;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> public boolean getFilter__IsNotDefault()<a name="line.84"></a>
<span class="sourceLineNo">085</span> {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> return m_format__IsNotDefault;<a name="line.86"></a>
+<span class="sourceLineNo">086</span> return m_filter__IsNotDefault;<a name="line.86"></a>
<span class="sourceLineNo">087</span> }<a name="line.87"></a>
-<span class="sourceLineNo">088</span> private boolean m_format__IsNotDefault;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // 21, 1<a name="line.89"></a>
-<span class="sourceLineNo">090</span> public void setFilter(String filter)<a name="line.90"></a>
+<span class="sourceLineNo">088</span> private boolean m_filter__IsNotDefault;<a name="line.88"></a>
+<span class="sourceLineNo">089</span> // 24, 1<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public void setBcv(String bcv)<a name="line.90"></a>
<span class="sourceLineNo">091</span> {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // 21, 1<a name="line.92"></a>
-<span class="sourceLineNo">093</span> m_filter = filter;<a name="line.93"></a>
-<span class="sourceLineNo">094</span> m_filter__IsNotDefault = true;<a name="line.94"></a>
+<span class="sourceLineNo">092</span> // 24, 1<a name="line.92"></a>
+<span class="sourceLineNo">093</span> m_bcv = bcv;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> m_bcv__IsNotDefault = true;<a name="line.94"></a>
<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public String getFilter()<a name="line.96"></a>
+<span class="sourceLineNo">096</span> public String getBcv()<a name="line.96"></a>
<span class="sourceLineNo">097</span> {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> return m_filter;<a name="line.98"></a>
+<span class="sourceLineNo">098</span> return m_bcv;<a name="line.98"></a>
<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> private String m_filter;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public boolean getFilter__IsNotDefault()<a name="line.101"></a>
+<span class="sourceLineNo">100</span> private String m_bcv;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> public boolean getBcv__IsNotDefault()<a name="line.101"></a>
<span class="sourceLineNo">102</span> {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return m_filter__IsNotDefault;<a name="line.103"></a>
+<span class="sourceLineNo">103</span> return m_bcv__IsNotDefault;<a name="line.103"></a>
<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> private boolean m_filter__IsNotDefault;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> // 24, 1<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public void setBcv(String bcv)<a name="line.107"></a>
+<span class="sourceLineNo">105</span> private boolean m_bcv__IsNotDefault;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> // 23, 1<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public void setBcn(String bcn)<a name="line.107"></a>
<span class="sourceLineNo">108</span> {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> // 24, 1<a name="line.109"></a>
-<span class="sourceLineNo">110</span> m_bcv = bcv;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> m_bcv__IsNotDefault = true;<a name="line.111"></a>
+<span class="sourceLineNo">109</span> // 23, 1<a name="line.109"></a>
+<span class="sourceLineNo">110</span> m_bcn = bcn;<a name="line.110"></a>
+<span class="sourceLineNo">111</span> m_bcn__IsNotDefault = true;<a name="line.111"></a>
<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> public String getBcv()<a name="line.113"></a>
+<span class="sourceLineNo">113</span> public String getBcn()<a name="line.113"></a>
<span class="sourceLineNo">114</span> {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return m_bcv;<a name="line.115"></a>
+<span class="sourceLineNo">115</span> return m_bcn;<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private String m_bcv;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public boolean getBcv__IsNotDefault()<a name="line.118"></a>
+<span class="sourceLineNo">117</span> private String m_bcn;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public boolean getBcn__IsNotDefault()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_bcv__IsNotDefault;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_bcn__IsNotDefault;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private boolean m_bcv__IsNotDefault;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> // 23, 1<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public void setBcn(String bcn)<a name="line.124"></a>
+<span class="sourceLineNo">122</span> private boolean m_bcn__IsNotDefault;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> // 22, 1<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public void setFormat(String format)<a name="line.124"></a>
<span class="sourceLineNo">125</span> {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> // 23, 1<a name="line.126"></a>
-<span class="sourceLineNo">127</span> m_bcn = bcn;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> m_bcn__IsNotDefault = true;<a name="line.128"></a>
+<span class="sourceLineNo">126</span> // 22, 1<a name="line.126"></a>
+<span class="sourceLineNo">127</span> m_format = format;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> m_format__IsNotDefault = true;<a name="line.128"></a>
<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span> public String getBcn()<a name="line.130"></a>
+<span class="sourceLineNo">130</span> public String getFormat()<a name="line.130"></a>
<span class="sourceLineNo">131</span> {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return m_bcn;<a name="line.132"></a>
+<span class="sourceLineNo">132</span> return m_format;<a name="line.132"></a>
<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> private String m_bcn;<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public boolean getBcn__IsNotDefault()<a name="line.135"></a>
+<span class="sourceLineNo">134</span> private String m_format;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> public boolean getFormat__IsNotDefault()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_bcn__IsNotDefault;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_format__IsNotDefault;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private boolean m_bcn__IsNotDefault;<a name="line.139"></a>
+<span class="sourceLineNo">139</span> private boolean m_format__IsNotDefault;<a name="line.139"></a>
<span class="sourceLineNo">140</span> }<a name="line.140"></a>
<span class="sourceLineNo">141</span> @Override<a name="line.141"></a>
<span class="sourceLineNo">142</span> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.142"></a>
@@ -156,31 +156,31 @@
<span class="sourceLineNo">148</span> return (ImplData) super.getImplData();<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> protected String format;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.152"></a>
+<span class="sourceLineNo">151</span> protected String filter;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.152"></a>
<span class="sourceLineNo">153</span> {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> (getImplData()).setFormat(p_format);<a name="line.154"></a>
+<span class="sourceLineNo">154</span> (getImplData()).setFilter(p_filter);<a name="line.154"></a>
<span class="sourceLineNo">155</span> return this;<a name="line.155"></a>
<span class="sourceLineNo">156</span> }<a name="line.156"></a>
<span class="sourceLineNo">157</span> <a name="line.157"></a>
-<span class="sourceLineNo">158</span> protected String filter;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.159"></a>
+<span class="sourceLineNo">158</span> protected String bcv;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.159"></a>
<span class="sourceLineNo">160</span> {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> (getImplData()).setFilter(p_filter);<a name="line.161"></a>
+<span class="sourceLineNo">161</span> (getImplData()).setBcv(p_bcv);<a name="line.161"></a>
<span class="sourceLineNo">162</span> return this;<a name="line.162"></a>
<span class="sourceLineNo">163</span> }<a name="line.163"></a>
<span class="sourceLineNo">164</span> <a name="line.164"></a>
-<span class="sourceLineNo">165</span> protected String bcv;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.166"></a>
+<span class="sourceLineNo">165</span> protected String bcn;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.166"></a>
<span class="sourceLineNo">167</span> {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> (getImplData()).setBcv(p_bcv);<a name="line.168"></a>
+<span class="sourceLineNo">168</span> (getImplData()).setBcn(p_bcn);<a name="line.168"></a>
<span class="sourceLineNo">169</span> return this;<a name="line.169"></a>
<span class="sourceLineNo">170</span> }<a name="line.170"></a>
<span class="sourceLineNo">171</span> <a name="line.171"></a>
-<span class="sourceLineNo">172</span> protected String bcn;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.173"></a>
+<span class="sourceLineNo">172</span> protected String format;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.173"></a>
<span class="sourceLineNo">174</span> {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> (getImplData()).setBcn(p_bcn);<a name="line.175"></a>
+<span class="sourceLineNo">175</span> (getImplData()).setFormat(p_format);<a name="line.175"></a>
<span class="sourceLineNo">176</span> return this;<a name="line.176"></a>
<span class="sourceLineNo">177</span> }<a name="line.177"></a>
<span class="sourceLineNo">178</span> <a name="line.178"></a>
[05/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/xref-test/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html b/xref-test/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
index 29cab65..ce41cb7 100644
--- a/xref-test/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
+++ b/xref-test/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
@@ -44,260 +44,260 @@
<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.conf.Configuration;
<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.fs.FileSystem;
<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.fs.Path;
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HBaseTestingUtility;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HConstants;
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HRegionInfo;
-<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableName;
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableNotFoundException;
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Admin;
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Table;
-<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.HMaster;
-<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.snapshot.SnapshotManager;
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;
-<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.testclassification.LargeTests;
-<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.testclassification.RegionServerTests;
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> org.junit.After;
-<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">import</strong> org.junit.AfterClass;
-<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">import</strong> org.junit.Before;
-<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">import</strong> org.junit.BeforeClass;
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">import</strong> org.junit.Ignore;
-<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">import</strong> org.junit.experimental.categories.Category;
-<a class="jxr_linenumber" name="58" href="#58">58</a>
-<a class="jxr_linenumber" name="59" href="#59">59</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="60" href="#60">60</a> <em class="jxr_javadoccomment"> * Test creating/using/deleting snapshots from the client</em>
-<a class="jxr_linenumber" name="61" href="#61">61</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="62" href="#62">62</a> <em class="jxr_javadoccomment"> * This is an end-to-end test for the snapshot utility</em>
-<a class="jxr_linenumber" name="63" href="#63">63</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="64" href="#64">64</a> <em class="jxr_javadoccomment"> * TODO This is essentially a clone of TestSnapshotFromClient. This is worth refactoring this</em>
-<a class="jxr_linenumber" name="65" href="#65">65</a> <em class="jxr_javadoccomment"> * because there will be a few more flavors of snapshots that need to run these tests.</em>
-<a class="jxr_linenumber" name="66" href="#66">66</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="67" href="#67">67</a> @Category({RegionServerTests.<strong class="jxr_keyword">class</strong>, LargeTests.<strong class="jxr_keyword">class</strong>})
-<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html">TestFlushSnapshotFromClient</a> {
-<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory.getLog(TestFlushSnapshotFromClient.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="70" href="#70">70</a>
-<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html">HBaseTestingUtility</a> UTIL = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html">HBaseTestingUtility</a>();
-<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_RS = 2;
-<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] TEST_FAM = Bytes.toBytes(<span class="jxr_string">"fam"</span>);
-<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> TableName TABLE_NAME = TableName.valueOf(<span class="jxr_string">"test"</span>);
-<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> DEFAULT_NUM_ROWS = 100;
-<a class="jxr_linenumber" name="76" href="#76">76</a>
-<a class="jxr_linenumber" name="77" href="#77">77</a> @BeforeClass
-<a class="jxr_linenumber" name="78" href="#78">78</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> setupCluster() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="79" href="#79">79</a> setupConf(UTIL.getConfiguration());
-<a class="jxr_linenumber" name="80" href="#80">80</a> UTIL.startMiniCluster(NUM_RS);
-<a class="jxr_linenumber" name="81" href="#81">81</a> }
-<a class="jxr_linenumber" name="82" href="#82">82</a>
-<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> setupConf(Configuration conf) {
-<a class="jxr_linenumber" name="84" href="#84">84</a> <em class="jxr_comment">// disable the ui</em>
-<a class="jxr_linenumber" name="85" href="#85">85</a> conf.setInt(<span class="jxr_string">"hbase.regionsever.info.port"</span>, -1);
-<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_comment">// change the flush size to a small amount, regulating number of store files</em>
-<a class="jxr_linenumber" name="87" href="#87">87</a> conf.setInt(<span class="jxr_string">"hbase.hregion.memstore.flush.size"</span>, 25000);
-<a class="jxr_linenumber" name="88" href="#88">88</a> <em class="jxr_comment">// so make sure we get a compaction when doing a load, but keep around some</em>
-<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// files in the store</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a> conf.setInt(<span class="jxr_string">"hbase.hstore.compaction.min"</span>, 10);
-<a class="jxr_linenumber" name="91" href="#91">91</a> conf.setInt(<span class="jxr_string">"hbase.hstore.compactionThreshold"</span>, 10);
-<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_comment">// block writes if we get to 12 store files</em>
-<a class="jxr_linenumber" name="93" href="#93">93</a> conf.setInt(<span class="jxr_string">"hbase.hstore.blockingStoreFiles"</span>, 12);
-<a class="jxr_linenumber" name="94" href="#94">94</a> <em class="jxr_comment">// Enable snapshot</em>
-<a class="jxr_linenumber" name="95" href="#95">95</a> conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="96" href="#96">96</a> conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY,
-<a class="jxr_linenumber" name="97" href="#97">97</a> ConstantSizeRegionSplitPolicy.<strong class="jxr_keyword">class</strong>.getName());
-<a class="jxr_linenumber" name="98" href="#98">98</a> }
-<a class="jxr_linenumber" name="99" href="#99">99</a>
-<a class="jxr_linenumber" name="100" href="#100">100</a> @Before
-<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setup() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="102" href="#102">102</a> createTable();
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.CategoryBasedTimeout;
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HBaseTestingUtility;
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HConstants;
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HRegionInfo;
+<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableName;
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableNotFoundException;
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Admin;
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Table;
+<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.HMaster;
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.snapshot.SnapshotManager;
+<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
+<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;
+<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.testclassification.LargeTests;
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.testclassification.RegionServerTests;
+<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">import</strong> org.junit.After;
+<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">import</strong> org.junit.AfterClass;
+<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">import</strong> org.junit.Before;
+<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">import</strong> org.junit.BeforeClass;
+<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">import</strong> org.junit.Rule;
+<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="58" href="#58">58</a> <strong class="jxr_keyword">import</strong> org.junit.experimental.categories.Category;
+<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">import</strong> org.junit.rules.TestRule;
+<a class="jxr_linenumber" name="60" href="#60">60</a>
+<a class="jxr_linenumber" name="61" href="#61">61</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="62" href="#62">62</a> <em class="jxr_javadoccomment"> * Test creating/using/deleting snapshots from the client</em>
+<a class="jxr_linenumber" name="63" href="#63">63</a> <em class="jxr_javadoccomment"> * <p></em>
+<a class="jxr_linenumber" name="64" href="#64">64</a> <em class="jxr_javadoccomment"> * This is an end-to-end test for the snapshot utility</em>
+<a class="jxr_linenumber" name="65" href="#65">65</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="66" href="#66">66</a> <em class="jxr_javadoccomment"> * TODO This is essentially a clone of TestSnapshotFromClient. This is worth refactoring this</em>
+<a class="jxr_linenumber" name="67" href="#67">67</a> <em class="jxr_javadoccomment"> * because there will be a few more flavors of snapshots that need to run these tests.</em>
+<a class="jxr_linenumber" name="68" href="#68">68</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="69" href="#69">69</a> @Category({RegionServerTests.<strong class="jxr_keyword">class</strong>, LargeTests.<strong class="jxr_keyword">class</strong>})
+<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html">TestFlushSnapshotFromClient</a> {
+<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory.getLog(TestFlushSnapshotFromClient.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="72" href="#72">72</a> @Rule <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> TestRule timeout = CategoryBasedTimeout.builder().withTimeout(<strong class="jxr_keyword">this</strong>.getClass()).
+<a class="jxr_linenumber" name="73" href="#73">73</a> withLookingForStuckThread(<strong class="jxr_keyword">true</strong>).build();
+<a class="jxr_linenumber" name="74" href="#74">74</a>
+<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html">HBaseTestingUtility</a> UTIL = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html">HBaseTestingUtility</a>();
+<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NUM_RS = 2;
+<a class="jxr_linenumber" name="77" href="#77">77</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] TEST_FAM = Bytes.toBytes(<span class="jxr_string">"fam"</span>);
+<a class="jxr_linenumber" name="78" href="#78">78</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> TableName TABLE_NAME = TableName.valueOf(<span class="jxr_string">"test"</span>);
+<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> DEFAULT_NUM_ROWS = 100;
+<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">protected</strong> Admin admin = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="81" href="#81">81</a>
+<a class="jxr_linenumber" name="82" href="#82">82</a> @BeforeClass
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> setupCluster() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="84" href="#84">84</a> setupConf(UTIL.getConfiguration());
+<a class="jxr_linenumber" name="85" href="#85">85</a> UTIL.startMiniCluster(NUM_RS);
+<a class="jxr_linenumber" name="86" href="#86">86</a> }
+<a class="jxr_linenumber" name="87" href="#87">87</a>
+<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> setupConf(Configuration conf) {
+<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// disable the ui</em>
+<a class="jxr_linenumber" name="90" href="#90">90</a> conf.setInt(<span class="jxr_string">"hbase.regionsever.info.port"</span>, -1);
+<a class="jxr_linenumber" name="91" href="#91">91</a> <em class="jxr_comment">// change the flush size to a small amount, regulating number of store files</em>
+<a class="jxr_linenumber" name="92" href="#92">92</a> conf.setInt(<span class="jxr_string">"hbase.hregion.memstore.flush.size"</span>, 25000);
+<a class="jxr_linenumber" name="93" href="#93">93</a> <em class="jxr_comment">// so make sure we get a compaction when doing a load, but keep around some</em>
+<a class="jxr_linenumber" name="94" href="#94">94</a> <em class="jxr_comment">// files in the store</em>
+<a class="jxr_linenumber" name="95" href="#95">95</a> conf.setInt(<span class="jxr_string">"hbase.hstore.compaction.min"</span>, 10);
+<a class="jxr_linenumber" name="96" href="#96">96</a> conf.setInt(<span class="jxr_string">"hbase.hstore.compactionThreshold"</span>, 10);
+<a class="jxr_linenumber" name="97" href="#97">97</a> <em class="jxr_comment">// block writes if we get to 12 store files</em>
+<a class="jxr_linenumber" name="98" href="#98">98</a> conf.setInt(<span class="jxr_string">"hbase.hstore.blockingStoreFiles"</span>, 12);
+<a class="jxr_linenumber" name="99" href="#99">99</a> <em class="jxr_comment">// Enable snapshot</em>
+<a class="jxr_linenumber" name="100" href="#100">100</a> conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="101" href="#101">101</a> conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY,
+<a class="jxr_linenumber" name="102" href="#102">102</a> ConstantSizeRegionSplitPolicy.<strong class="jxr_keyword">class</strong>.getName());
<a class="jxr_linenumber" name="103" href="#103">103</a> }
<a class="jxr_linenumber" name="104" href="#104">104</a>
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> createTable() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="106" href="#106">106</a> SnapshotTestingUtils.createTable(UTIL, TABLE_NAME, TEST_FAM);
-<a class="jxr_linenumber" name="107" href="#107">107</a> }
-<a class="jxr_linenumber" name="108" href="#108">108</a>
-<a class="jxr_linenumber" name="109" href="#109">109</a> @After
-<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> tearDown() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="111" href="#111">111</a> UTIL.deleteTable(TABLE_NAME);
-<a class="jxr_linenumber" name="112" href="#112">112</a>
-<a class="jxr_linenumber" name="113" href="#113">113</a> SnapshotTestingUtils.deleteAllSnapshots(UTIL.getHBaseAdmin());
-<a class="jxr_linenumber" name="114" href="#114">114</a> SnapshotTestingUtils.deleteArchiveDirectory(UTIL);
-<a class="jxr_linenumber" name="115" href="#115">115</a> }
-<a class="jxr_linenumber" name="116" href="#116">116</a>
-<a class="jxr_linenumber" name="117" href="#117">117</a> @AfterClass
-<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> cleanupTest() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="119" href="#119">119</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="120" href="#120">120</a> UTIL.shutdownMiniCluster();
-<a class="jxr_linenumber" name="121" href="#121">121</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="122" href="#122">122</a> LOG.warn(<span class="jxr_string">"failure shutting down cluster"</span>, e);
-<a class="jxr_linenumber" name="123" href="#123">123</a> }
-<a class="jxr_linenumber" name="124" href="#124">124</a> }
-<a class="jxr_linenumber" name="125" href="#125">125</a>
-<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_javadoccomment"> * Test simple flush snapshotting a table that is online</em>
-<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
-<a class="jxr_linenumber" name="129" href="#129">129</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="130" href="#130">130</a> @Test (timeout=300000)
-<a class="jxr_linenumber" name="131" href="#131">131</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFlushTableSnapshot() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="132" href="#132">132</a> Admin admin = UTIL.getHBaseAdmin();
-<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
-<a class="jxr_linenumber" name="134" href="#134">134</a> SnapshotTestingUtils.assertNoSnapshots(admin);
-<a class="jxr_linenumber" name="135" href="#135">135</a>
-<a class="jxr_linenumber" name="136" href="#136">136</a> <em class="jxr_comment">// put some stuff in the table</em>
-<a class="jxr_linenumber" name="137" href="#137">137</a> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);
-<a class="jxr_linenumber" name="138" href="#138">138</a>
-<a class="jxr_linenumber" name="139" href="#139">139</a> LOG.debug(<span class="jxr_string">"FS state before snapshot:"</span>);
-<a class="jxr_linenumber" name="140" href="#140">140</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
-<a class="jxr_linenumber" name="141" href="#141">141</a>
-<a class="jxr_linenumber" name="142" href="#142">142</a> <em class="jxr_comment">// take a snapshot of the enabled table</em>
-<a class="jxr_linenumber" name="143" href="#143">143</a> String snapshotString = <span class="jxr_string">"offlineTableSnapshot"</span>;
-<a class="jxr_linenumber" name="144" href="#144">144</a> byte[] snapshot = Bytes.toBytes(snapshotString);
-<a class="jxr_linenumber" name="145" href="#145">145</a> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.FLUSH);
-<a class="jxr_linenumber" name="146" href="#146">146</a> LOG.debug(<span class="jxr_string">"Snapshot completed."</span>);
-<a class="jxr_linenumber" name="147" href="#147">147</a>
-<a class="jxr_linenumber" name="148" href="#148">148</a> <em class="jxr_comment">// make sure we have the snapshot</em>
-<a class="jxr_linenumber" name="149" href="#149">149</a> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,
-<a class="jxr_linenumber" name="150" href="#150">150</a> snapshot, TABLE_NAME);
-<a class="jxr_linenumber" name="151" href="#151">151</a>
-<a class="jxr_linenumber" name="152" href="#152">152</a> <em class="jxr_comment">// make sure its a valid snapshot</em>
-<a class="jxr_linenumber" name="153" href="#153">153</a> LOG.debug(<span class="jxr_string">"FS state after snapshot:"</span>);
-<a class="jxr_linenumber" name="154" href="#154">154</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
-<a class="jxr_linenumber" name="155" href="#155">155</a>
-<a class="jxr_linenumber" name="156" href="#156">156</a> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);
-<a class="jxr_linenumber" name="157" href="#157">157</a> }
-<a class="jxr_linenumber" name="158" href="#158">158</a>
-<a class="jxr_linenumber" name="159" href="#159">159</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="160" href="#160">160</a> <em class="jxr_javadoccomment"> * Test snapshotting a table that is online without flushing</em>
-<a class="jxr_linenumber" name="161" href="#161">161</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
-<a class="jxr_linenumber" name="162" href="#162">162</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="163" href="#163">163</a> @Test(timeout=30000)
-<a class="jxr_linenumber" name="164" href="#164">164</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSkipFlushTableSnapshot() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="165" href="#165">165</a> Admin admin = UTIL.getHBaseAdmin();
-<a class="jxr_linenumber" name="166" href="#166">166</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
-<a class="jxr_linenumber" name="167" href="#167">167</a> SnapshotTestingUtils.assertNoSnapshots(admin);
-<a class="jxr_linenumber" name="168" href="#168">168</a>
-<a class="jxr_linenumber" name="169" href="#169">169</a> <em class="jxr_comment">// put some stuff in the table</em>
-<a class="jxr_linenumber" name="170" href="#170">170</a> Table table = UTIL.getConnection().getTable(TABLE_NAME);
-<a class="jxr_linenumber" name="171" href="#171">171</a> UTIL.loadTable(table, TEST_FAM);
-<a class="jxr_linenumber" name="172" href="#172">172</a> UTIL.flush(TABLE_NAME);
-<a class="jxr_linenumber" name="173" href="#173">173</a>
-<a class="jxr_linenumber" name="174" href="#174">174</a> LOG.debug(<span class="jxr_string">"FS state before snapshot:"</span>);
-<a class="jxr_linenumber" name="175" href="#175">175</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
-<a class="jxr_linenumber" name="176" href="#176">176</a>
-<a class="jxr_linenumber" name="177" href="#177">177</a> <em class="jxr_comment">// take a snapshot of the enabled table</em>
-<a class="jxr_linenumber" name="178" href="#178">178</a> String snapshotString = <span class="jxr_string">"skipFlushTableSnapshot"</span>;
-<a class="jxr_linenumber" name="179" href="#179">179</a> byte[] snapshot = Bytes.toBytes(snapshotString);
-<a class="jxr_linenumber" name="180" href="#180">180</a> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.SKIPFLUSH);
-<a class="jxr_linenumber" name="181" href="#181">181</a> LOG.debug(<span class="jxr_string">"Snapshot completed."</span>);
-<a class="jxr_linenumber" name="182" href="#182">182</a>
-<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_comment">// make sure we have the snapshot</em>
-<a class="jxr_linenumber" name="184" href="#184">184</a> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,
-<a class="jxr_linenumber" name="185" href="#185">185</a> snapshot, TABLE_NAME);
+<a class="jxr_linenumber" name="105" href="#105">105</a> @Before
+<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setup() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="107" href="#107">107</a> createTable();
+<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">this</strong>.admin = UTIL.getConnection().getAdmin();
+<a class="jxr_linenumber" name="109" href="#109">109</a> }
+<a class="jxr_linenumber" name="110" href="#110">110</a>
+<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> createTable() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="112" href="#112">112</a> SnapshotTestingUtils.createTable(UTIL, TABLE_NAME, TEST_FAM);
+<a class="jxr_linenumber" name="113" href="#113">113</a> }
+<a class="jxr_linenumber" name="114" href="#114">114</a>
+<a class="jxr_linenumber" name="115" href="#115">115</a> @After
+<a class="jxr_linenumber" name="116" href="#116">116</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> tearDown() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="117" href="#117">117</a> UTIL.deleteTable(TABLE_NAME);
+<a class="jxr_linenumber" name="118" href="#118">118</a> SnapshotTestingUtils.deleteAllSnapshots(<strong class="jxr_keyword">this</strong>.admin);
+<a class="jxr_linenumber" name="119" href="#119">119</a> <strong class="jxr_keyword">this</strong>.admin.close();
+<a class="jxr_linenumber" name="120" href="#120">120</a> SnapshotTestingUtils.deleteArchiveDirectory(UTIL);
+<a class="jxr_linenumber" name="121" href="#121">121</a> }
+<a class="jxr_linenumber" name="122" href="#122">122</a>
+<a class="jxr_linenumber" name="123" href="#123">123</a> @AfterClass
+<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> cleanupTest() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="126" href="#126">126</a> UTIL.shutdownMiniCluster();
+<a class="jxr_linenumber" name="127" href="#127">127</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="128" href="#128">128</a> LOG.warn(<span class="jxr_string">"failure shutting down cluster"</span>, e);
+<a class="jxr_linenumber" name="129" href="#129">129</a> }
+<a class="jxr_linenumber" name="130" href="#130">130</a> }
+<a class="jxr_linenumber" name="131" href="#131">131</a>
+<a class="jxr_linenumber" name="132" href="#132">132</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_javadoccomment"> * Test simple flush snapshotting a table that is online</em>
+<a class="jxr_linenumber" name="134" href="#134">134</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
+<a class="jxr_linenumber" name="135" href="#135">135</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="136" href="#136">136</a> @Test
+<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFlushTableSnapshot() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="138" href="#138">138</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
+<a class="jxr_linenumber" name="139" href="#139">139</a> SnapshotTestingUtils.assertNoSnapshots(admin);
+<a class="jxr_linenumber" name="140" href="#140">140</a>
+<a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_comment">// put some stuff in the table</em>
+<a class="jxr_linenumber" name="142" href="#142">142</a> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);
+<a class="jxr_linenumber" name="143" href="#143">143</a>
+<a class="jxr_linenumber" name="144" href="#144">144</a> LOG.debug(<span class="jxr_string">"FS state before snapshot:"</span>);
+<a class="jxr_linenumber" name="145" href="#145">145</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
+<a class="jxr_linenumber" name="146" href="#146">146</a>
+<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_comment">// take a snapshot of the enabled table</em>
+<a class="jxr_linenumber" name="148" href="#148">148</a> String snapshotString = <span class="jxr_string">"offlineTableSnapshot"</span>;
+<a class="jxr_linenumber" name="149" href="#149">149</a> byte[] snapshot = Bytes.toBytes(snapshotString);
+<a class="jxr_linenumber" name="150" href="#150">150</a> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.FLUSH);
+<a class="jxr_linenumber" name="151" href="#151">151</a> LOG.debug(<span class="jxr_string">"Snapshot completed."</span>);
+<a class="jxr_linenumber" name="152" href="#152">152</a>
+<a class="jxr_linenumber" name="153" href="#153">153</a> <em class="jxr_comment">// make sure we have the snapshot</em>
+<a class="jxr_linenumber" name="154" href="#154">154</a> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,
+<a class="jxr_linenumber" name="155" href="#155">155</a> snapshot, TABLE_NAME);
+<a class="jxr_linenumber" name="156" href="#156">156</a>
+<a class="jxr_linenumber" name="157" href="#157">157</a> <em class="jxr_comment">// make sure its a valid snapshot</em>
+<a class="jxr_linenumber" name="158" href="#158">158</a> LOG.debug(<span class="jxr_string">"FS state after snapshot:"</span>);
+<a class="jxr_linenumber" name="159" href="#159">159</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
+<a class="jxr_linenumber" name="160" href="#160">160</a>
+<a class="jxr_linenumber" name="161" href="#161">161</a> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);
+<a class="jxr_linenumber" name="162" href="#162">162</a> }
+<a class="jxr_linenumber" name="163" href="#163">163</a>
+<a class="jxr_linenumber" name="164" href="#164">164</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="165" href="#165">165</a> <em class="jxr_javadoccomment"> * Test snapshotting a table that is online without flushing</em>
+<a class="jxr_linenumber" name="166" href="#166">166</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
+<a class="jxr_linenumber" name="167" href="#167">167</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="168" href="#168">168</a> @Test
+<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSkipFlushTableSnapshot() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="170" href="#170">170</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
+<a class="jxr_linenumber" name="171" href="#171">171</a> SnapshotTestingUtils.assertNoSnapshots(admin);
+<a class="jxr_linenumber" name="172" href="#172">172</a>
+<a class="jxr_linenumber" name="173" href="#173">173</a> <em class="jxr_comment">// put some stuff in the table</em>
+<a class="jxr_linenumber" name="174" href="#174">174</a> Table table = UTIL.getConnection().getTable(TABLE_NAME);
+<a class="jxr_linenumber" name="175" href="#175">175</a> UTIL.loadTable(table, TEST_FAM);
+<a class="jxr_linenumber" name="176" href="#176">176</a> UTIL.flush(TABLE_NAME);
+<a class="jxr_linenumber" name="177" href="#177">177</a>
+<a class="jxr_linenumber" name="178" href="#178">178</a> LOG.debug(<span class="jxr_string">"FS state before snapshot:"</span>);
+<a class="jxr_linenumber" name="179" href="#179">179</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
+<a class="jxr_linenumber" name="180" href="#180">180</a>
+<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_comment">// take a snapshot of the enabled table</em>
+<a class="jxr_linenumber" name="182" href="#182">182</a> String snapshotString = <span class="jxr_string">"skipFlushTableSnapshot"</span>;
+<a class="jxr_linenumber" name="183" href="#183">183</a> byte[] snapshot = Bytes.toBytes(snapshotString);
+<a class="jxr_linenumber" name="184" href="#184">184</a> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.SKIPFLUSH);
+<a class="jxr_linenumber" name="185" href="#185">185</a> LOG.debug(<span class="jxr_string">"Snapshot completed."</span>);
<a class="jxr_linenumber" name="186" href="#186">186</a>
-<a class="jxr_linenumber" name="187" href="#187">187</a> <em class="jxr_comment">// make sure its a valid snapshot</em>
-<a class="jxr_linenumber" name="188" href="#188">188</a> LOG.debug(<span class="jxr_string">"FS state after snapshot:"</span>);
-<a class="jxr_linenumber" name="189" href="#189">189</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
+<a class="jxr_linenumber" name="187" href="#187">187</a> <em class="jxr_comment">// make sure we have the snapshot</em>
+<a class="jxr_linenumber" name="188" href="#188">188</a> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,
+<a class="jxr_linenumber" name="189" href="#189">189</a> snapshot, TABLE_NAME);
<a class="jxr_linenumber" name="190" href="#190">190</a>
-<a class="jxr_linenumber" name="191" href="#191">191</a> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);
-<a class="jxr_linenumber" name="192" href="#192">192</a>
-<a class="jxr_linenumber" name="193" href="#193">193</a> admin.deleteSnapshot(snapshot);
-<a class="jxr_linenumber" name="194" href="#194">194</a> snapshots = admin.listSnapshots();
-<a class="jxr_linenumber" name="195" href="#195">195</a> SnapshotTestingUtils.assertNoSnapshots(admin);
-<a class="jxr_linenumber" name="196" href="#196">196</a> }
-<a class="jxr_linenumber" name="197" href="#197">197</a>
-<a class="jxr_linenumber" name="198" href="#198">198</a>
-<a class="jxr_linenumber" name="199" href="#199">199</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="200" href="#200">200</a> <em class="jxr_javadoccomment"> * Test simple flush snapshotting a table that is online</em>
-<a class="jxr_linenumber" name="201" href="#201">201</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
-<a class="jxr_linenumber" name="202" href="#202">202</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="203" href="#203">203</a> @Test (timeout=300000)
-<a class="jxr_linenumber" name="204" href="#204">204</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFlushTableSnapshotWithProcedure() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="205" href="#205">205</a> Admin admin = UTIL.getHBaseAdmin();
-<a class="jxr_linenumber" name="206" href="#206">206</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
-<a class="jxr_linenumber" name="207" href="#207">207</a> SnapshotTestingUtils.assertNoSnapshots(admin);
-<a class="jxr_linenumber" name="208" href="#208">208</a>
-<a class="jxr_linenumber" name="209" href="#209">209</a> <em class="jxr_comment">// put some stuff in the table</em>
-<a class="jxr_linenumber" name="210" href="#210">210</a> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);
+<a class="jxr_linenumber" name="191" href="#191">191</a> <em class="jxr_comment">// make sure its a valid snapshot</em>
+<a class="jxr_linenumber" name="192" href="#192">192</a> LOG.debug(<span class="jxr_string">"FS state after snapshot:"</span>);
+<a class="jxr_linenumber" name="193" href="#193">193</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
+<a class="jxr_linenumber" name="194" href="#194">194</a>
+<a class="jxr_linenumber" name="195" href="#195">195</a> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);
+<a class="jxr_linenumber" name="196" href="#196">196</a>
+<a class="jxr_linenumber" name="197" href="#197">197</a> admin.deleteSnapshot(snapshot);
+<a class="jxr_linenumber" name="198" href="#198">198</a> snapshots = admin.listSnapshots();
+<a class="jxr_linenumber" name="199" href="#199">199</a> SnapshotTestingUtils.assertNoSnapshots(admin);
+<a class="jxr_linenumber" name="200" href="#200">200</a> }
+<a class="jxr_linenumber" name="201" href="#201">201</a>
+<a class="jxr_linenumber" name="202" href="#202">202</a>
+<a class="jxr_linenumber" name="203" href="#203">203</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="204" href="#204">204</a> <em class="jxr_javadoccomment"> * Test simple flush snapshotting a table that is online</em>
+<a class="jxr_linenumber" name="205" href="#205">205</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
+<a class="jxr_linenumber" name="206" href="#206">206</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="207" href="#207">207</a> @Test
+<a class="jxr_linenumber" name="208" href="#208">208</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFlushTableSnapshotWithProcedure() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="209" href="#209">209</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
+<a class="jxr_linenumber" name="210" href="#210">210</a> SnapshotTestingUtils.assertNoSnapshots(admin);
<a class="jxr_linenumber" name="211" href="#211">211</a>
-<a class="jxr_linenumber" name="212" href="#212">212</a> LOG.debug(<span class="jxr_string">"FS state before snapshot:"</span>);
-<a class="jxr_linenumber" name="213" href="#213">213</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
+<a class="jxr_linenumber" name="212" href="#212">212</a> <em class="jxr_comment">// put some stuff in the table</em>
+<a class="jxr_linenumber" name="213" href="#213">213</a> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);
<a class="jxr_linenumber" name="214" href="#214">214</a>
-<a class="jxr_linenumber" name="215" href="#215">215</a> <em class="jxr_comment">// take a snapshot of the enabled table</em>
-<a class="jxr_linenumber" name="216" href="#216">216</a> String snapshotString = <span class="jxr_string">"offlineTableSnapshot"</span>;
-<a class="jxr_linenumber" name="217" href="#217">217</a> byte[] snapshot = Bytes.toBytes(snapshotString);
-<a class="jxr_linenumber" name="218" href="#218">218</a> Map<String, String> props = <strong class="jxr_keyword">new</strong> HashMap<String, String>();
-<a class="jxr_linenumber" name="219" href="#219">219</a> props.put(<span class="jxr_string">"table"</span>, TABLE_NAME.getNameAsString());
-<a class="jxr_linenumber" name="220" href="#220">220</a> admin.execProcedure(SnapshotManager.ONLINE_SNAPSHOT_CONTROLLER_DESCRIPTION,
-<a class="jxr_linenumber" name="221" href="#221">221</a> snapshotString, props);
-<a class="jxr_linenumber" name="222" href="#222">222</a>
-<a class="jxr_linenumber" name="223" href="#223">223</a>
-<a class="jxr_linenumber" name="224" href="#224">224</a> LOG.debug(<span class="jxr_string">"Snapshot completed."</span>);
+<a class="jxr_linenumber" name="215" href="#215">215</a> LOG.debug(<span class="jxr_string">"FS state before snapshot:"</span>);
+<a class="jxr_linenumber" name="216" href="#216">216</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
+<a class="jxr_linenumber" name="217" href="#217">217</a>
+<a class="jxr_linenumber" name="218" href="#218">218</a> <em class="jxr_comment">// take a snapshot of the enabled table</em>
+<a class="jxr_linenumber" name="219" href="#219">219</a> String snapshotString = <span class="jxr_string">"offlineTableSnapshot"</span>;
+<a class="jxr_linenumber" name="220" href="#220">220</a> byte[] snapshot = Bytes.toBytes(snapshotString);
+<a class="jxr_linenumber" name="221" href="#221">221</a> Map<String, String> props = <strong class="jxr_keyword">new</strong> HashMap<String, String>();
+<a class="jxr_linenumber" name="222" href="#222">222</a> props.put(<span class="jxr_string">"table"</span>, TABLE_NAME.getNameAsString());
+<a class="jxr_linenumber" name="223" href="#223">223</a> admin.execProcedure(SnapshotManager.ONLINE_SNAPSHOT_CONTROLLER_DESCRIPTION,
+<a class="jxr_linenumber" name="224" href="#224">224</a> snapshotString, props);
<a class="jxr_linenumber" name="225" href="#225">225</a>
-<a class="jxr_linenumber" name="226" href="#226">226</a> <em class="jxr_comment">// make sure we have the snapshot</em>
-<a class="jxr_linenumber" name="227" href="#227">227</a> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,
-<a class="jxr_linenumber" name="228" href="#228">228</a> snapshot, TABLE_NAME);
-<a class="jxr_linenumber" name="229" href="#229">229</a>
-<a class="jxr_linenumber" name="230" href="#230">230</a> <em class="jxr_comment">// make sure its a valid snapshot</em>
-<a class="jxr_linenumber" name="231" href="#231">231</a> LOG.debug(<span class="jxr_string">"FS state after snapshot:"</span>);
-<a class="jxr_linenumber" name="232" href="#232">232</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
-<a class="jxr_linenumber" name="233" href="#233">233</a>
-<a class="jxr_linenumber" name="234" href="#234">234</a> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);
-<a class="jxr_linenumber" name="235" href="#235">235</a> }
+<a class="jxr_linenumber" name="226" href="#226">226</a>
+<a class="jxr_linenumber" name="227" href="#227">227</a> LOG.debug(<span class="jxr_string">"Snapshot completed."</span>);
+<a class="jxr_linenumber" name="228" href="#228">228</a>
+<a class="jxr_linenumber" name="229" href="#229">229</a> <em class="jxr_comment">// make sure we have the snapshot</em>
+<a class="jxr_linenumber" name="230" href="#230">230</a> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,
+<a class="jxr_linenumber" name="231" href="#231">231</a> snapshot, TABLE_NAME);
+<a class="jxr_linenumber" name="232" href="#232">232</a>
+<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_comment">// make sure its a valid snapshot</em>
+<a class="jxr_linenumber" name="234" href="#234">234</a> LOG.debug(<span class="jxr_string">"FS state after snapshot:"</span>);
+<a class="jxr_linenumber" name="235" href="#235">235</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
<a class="jxr_linenumber" name="236" href="#236">236</a>
-<a class="jxr_linenumber" name="237" href="#237">237</a> @Test (timeout=300000)
-<a class="jxr_linenumber" name="238" href="#238">238</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSnapshotFailsOnNonExistantTable() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="239" href="#239">239</a> Admin admin = UTIL.getHBaseAdmin();
-<a class="jxr_linenumber" name="240" href="#240">240</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
-<a class="jxr_linenumber" name="241" href="#241">241</a> SnapshotTestingUtils.assertNoSnapshots(admin);
-<a class="jxr_linenumber" name="242" href="#242">242</a> TableName tableName = TableName.valueOf(<span class="jxr_string">"_not_a_table"</span>);
-<a class="jxr_linenumber" name="243" href="#243">243</a>
-<a class="jxr_linenumber" name="244" href="#244">244</a> <em class="jxr_comment">// make sure the table doesn't exist</em>
-<a class="jxr_linenumber" name="245" href="#245">245</a> <strong class="jxr_keyword">boolean</strong> fail = false;
-<a class="jxr_linenumber" name="246" href="#246">246</a> <strong class="jxr_keyword">do</strong> {
-<a class="jxr_linenumber" name="247" href="#247">247</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="248" href="#248">248</a> admin.getTableDescriptor(tableName);
-<a class="jxr_linenumber" name="249" href="#249">249</a> fail = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="250" href="#250">250</a> LOG.error(<span class="jxr_string">"Table:"</span> + tableName + <span class="jxr_string">" already exists, checking a new name"</span>);
-<a class="jxr_linenumber" name="251" href="#251">251</a> tableName = TableName.valueOf(tableName+<span class="jxr_string">"!"</span>);
-<a class="jxr_linenumber" name="252" href="#252">252</a> } <strong class="jxr_keyword">catch</strong> (TableNotFoundException e) {
-<a class="jxr_linenumber" name="253" href="#253">253</a> fail = false;
-<a class="jxr_linenumber" name="254" href="#254">254</a> }
-<a class="jxr_linenumber" name="255" href="#255">255</a> } <strong class="jxr_keyword">while</strong> (fail);
-<a class="jxr_linenumber" name="256" href="#256">256</a>
-<a class="jxr_linenumber" name="257" href="#257">257</a> <em class="jxr_comment">// snapshot the non-existant table</em>
-<a class="jxr_linenumber" name="258" href="#258">258</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="259" href="#259">259</a> admin.snapshot(<span class="jxr_string">"fail"</span>, tableName, SnapshotDescription.Type.FLUSH);
-<a class="jxr_linenumber" name="260" href="#260">260</a> fail(<span class="jxr_string">"Snapshot succeeded even though there is not table."</span>);
-<a class="jxr_linenumber" name="261" href="#261">261</a> } <strong class="jxr_keyword">catch</strong> (SnapshotCreationException e) {
-<a class="jxr_linenumber" name="262" href="#262">262</a> LOG.info(<span class="jxr_string">"Correctly failed to snapshot a non-existant table:"</span> + e.getMessage());
-<a class="jxr_linenumber" name="263" href="#263">263</a> }
-<a class="jxr_linenumber" name="264" href="#264">264</a> }
-<a class="jxr_linenumber" name="265" href="#265">265</a>
-<a class="jxr_linenumber" name="266" href="#266">266</a> @Test(timeout = 300000)
-<a class="jxr_linenumber" name="267" href="#267">267</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testAsyncFlushSnapshot() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="268" href="#268">268</a> Admin admin = UTIL.getHBaseAdmin();
-<a class="jxr_linenumber" name="269" href="#269">269</a> SnapshotDescription snapshot = SnapshotDescription.newBuilder().setName(<span class="jxr_string">"asyncSnapshot"</span>)
-<a class="jxr_linenumber" name="270" href="#270">270</a> .setTable(TABLE_NAME.getNameAsString())
-<a class="jxr_linenumber" name="271" href="#271">271</a> .setType(SnapshotDescription.Type.FLUSH)
-<a class="jxr_linenumber" name="272" href="#272">272</a> .build();
-<a class="jxr_linenumber" name="273" href="#273">273</a>
-<a class="jxr_linenumber" name="274" href="#274">274</a> <em class="jxr_comment">// take the snapshot async</em>
-<a class="jxr_linenumber" name="275" href="#275">275</a> admin.takeSnapshotAsync(snapshot);
-<a class="jxr_linenumber" name="276" href="#276">276</a>
-<a class="jxr_linenumber" name="277" href="#277">277</a> <em class="jxr_comment">// constantly loop, looking for the snapshot to complete</em>
-<a class="jxr_linenumber" name="278" href="#278">278</a> HMaster master = UTIL.getMiniHBaseCluster().getMaster();
-<a class="jxr_linenumber" name="279" href="#279">279</a> SnapshotTestingUtils.waitForSnapshotToComplete(master, snapshot, 200);
-<a class="jxr_linenumber" name="280" href="#280">280</a> LOG.info(<span class="jxr_string">" === Async Snapshot Completed ==="</span>);
-<a class="jxr_linenumber" name="281" href="#281">281</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
-<a class="jxr_linenumber" name="282" href="#282">282</a>
-<a class="jxr_linenumber" name="283" href="#283">283</a> <em class="jxr_comment">// make sure we get the snapshot</em>
-<a class="jxr_linenumber" name="284" href="#284">284</a> SnapshotTestingUtils.assertOneSnapshotThatMatches(admin, snapshot);
-<a class="jxr_linenumber" name="285" href="#285">285</a> }
-<a class="jxr_linenumber" name="286" href="#286">286</a>
-<a class="jxr_linenumber" name="287" href="#287">287</a> @Test (timeout=300000)
-<a class="jxr_linenumber" name="288" href="#288">288</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSnapshotStateAfterMerge() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="289" href="#289">289</a> <strong class="jxr_keyword">int</strong> numRows = DEFAULT_NUM_ROWS;
-<a class="jxr_linenumber" name="290" href="#290">290</a> Admin admin = UTIL.getHBaseAdmin();
+<a class="jxr_linenumber" name="237" href="#237">237</a> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);
+<a class="jxr_linenumber" name="238" href="#238">238</a> }
+<a class="jxr_linenumber" name="239" href="#239">239</a>
+<a class="jxr_linenumber" name="240" href="#240">240</a> @Test
+<a class="jxr_linenumber" name="241" href="#241">241</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSnapshotFailsOnNonExistantTable() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="242" href="#242">242</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
+<a class="jxr_linenumber" name="243" href="#243">243</a> SnapshotTestingUtils.assertNoSnapshots(admin);
+<a class="jxr_linenumber" name="244" href="#244">244</a> TableName tableName = TableName.valueOf(<span class="jxr_string">"_not_a_table"</span>);
+<a class="jxr_linenumber" name="245" href="#245">245</a>
+<a class="jxr_linenumber" name="246" href="#246">246</a> <em class="jxr_comment">// make sure the table doesn't exist</em>
+<a class="jxr_linenumber" name="247" href="#247">247</a> <strong class="jxr_keyword">boolean</strong> fail = false;
+<a class="jxr_linenumber" name="248" href="#248">248</a> <strong class="jxr_keyword">do</strong> {
+<a class="jxr_linenumber" name="249" href="#249">249</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="250" href="#250">250</a> admin.getTableDescriptor(tableName);
+<a class="jxr_linenumber" name="251" href="#251">251</a> fail = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="252" href="#252">252</a> LOG.error(<span class="jxr_string">"Table:"</span> + tableName + <span class="jxr_string">" already exists, checking a new name"</span>);
+<a class="jxr_linenumber" name="253" href="#253">253</a> tableName = TableName.valueOf(tableName+<span class="jxr_string">"!"</span>);
+<a class="jxr_linenumber" name="254" href="#254">254</a> } <strong class="jxr_keyword">catch</strong> (TableNotFoundException e) {
+<a class="jxr_linenumber" name="255" href="#255">255</a> fail = false;
+<a class="jxr_linenumber" name="256" href="#256">256</a> }
+<a class="jxr_linenumber" name="257" href="#257">257</a> } <strong class="jxr_keyword">while</strong> (fail);
+<a class="jxr_linenumber" name="258" href="#258">258</a>
+<a class="jxr_linenumber" name="259" href="#259">259</a> <em class="jxr_comment">// snapshot the non-existant table</em>
+<a class="jxr_linenumber" name="260" href="#260">260</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="261" href="#261">261</a> admin.snapshot(<span class="jxr_string">"fail"</span>, tableName, SnapshotDescription.Type.FLUSH);
+<a class="jxr_linenumber" name="262" href="#262">262</a> fail(<span class="jxr_string">"Snapshot succeeded even though there is not table."</span>);
+<a class="jxr_linenumber" name="263" href="#263">263</a> } <strong class="jxr_keyword">catch</strong> (SnapshotCreationException e) {
+<a class="jxr_linenumber" name="264" href="#264">264</a> LOG.info(<span class="jxr_string">"Correctly failed to snapshot a non-existant table:"</span> + e.getMessage());
+<a class="jxr_linenumber" name="265" href="#265">265</a> }
+<a class="jxr_linenumber" name="266" href="#266">266</a> }
+<a class="jxr_linenumber" name="267" href="#267">267</a>
+<a class="jxr_linenumber" name="268" href="#268">268</a> @Test
+<a class="jxr_linenumber" name="269" href="#269">269</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testAsyncFlushSnapshot() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="270" href="#270">270</a> SnapshotDescription snapshot = SnapshotDescription.newBuilder().setName(<span class="jxr_string">"asyncSnapshot"</span>)
+<a class="jxr_linenumber" name="271" href="#271">271</a> .setTable(TABLE_NAME.getNameAsString())
+<a class="jxr_linenumber" name="272" href="#272">272</a> .setType(SnapshotDescription.Type.FLUSH)
+<a class="jxr_linenumber" name="273" href="#273">273</a> .build();
+<a class="jxr_linenumber" name="274" href="#274">274</a>
+<a class="jxr_linenumber" name="275" href="#275">275</a> <em class="jxr_comment">// take the snapshot async</em>
+<a class="jxr_linenumber" name="276" href="#276">276</a> admin.takeSnapshotAsync(snapshot);
+<a class="jxr_linenumber" name="277" href="#277">277</a>
+<a class="jxr_linenumber" name="278" href="#278">278</a> <em class="jxr_comment">// constantly loop, looking for the snapshot to complete</em>
+<a class="jxr_linenumber" name="279" href="#279">279</a> HMaster master = UTIL.getMiniHBaseCluster().getMaster();
+<a class="jxr_linenumber" name="280" href="#280">280</a> SnapshotTestingUtils.waitForSnapshotToComplete(master, snapshot, 200);
+<a class="jxr_linenumber" name="281" href="#281">281</a> LOG.info(<span class="jxr_string">" === Async Snapshot Completed ==="</span>);
+<a class="jxr_linenumber" name="282" href="#282">282</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
+<a class="jxr_linenumber" name="283" href="#283">283</a>
+<a class="jxr_linenumber" name="284" href="#284">284</a> <em class="jxr_comment">// make sure we get the snapshot</em>
+<a class="jxr_linenumber" name="285" href="#285">285</a> SnapshotTestingUtils.assertOneSnapshotThatMatches(admin, snapshot);
+<a class="jxr_linenumber" name="286" href="#286">286</a> }
+<a class="jxr_linenumber" name="287" href="#287">287</a>
+<a class="jxr_linenumber" name="288" href="#288">288</a> @Test
+<a class="jxr_linenumber" name="289" href="#289">289</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSnapshotStateAfterMerge() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="290" href="#290">290</a> <strong class="jxr_keyword">int</strong> numRows = DEFAULT_NUM_ROWS;
<a class="jxr_linenumber" name="291" href="#291">291</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
<a class="jxr_linenumber" name="292" href="#292">292</a> SnapshotTestingUtils.assertNoSnapshots(admin);
<a class="jxr_linenumber" name="293" href="#293">293</a> <em class="jxr_comment">// load the table so we have some data</em>
@@ -345,199 +345,194 @@
<a class="jxr_linenumber" name="335" href="#335">335</a> UTIL.deleteTable(cloneBeforeMergeName);
<a class="jxr_linenumber" name="336" href="#336">336</a> }
<a class="jxr_linenumber" name="337" href="#337">337</a>
-<a class="jxr_linenumber" name="338" href="#338">338</a> @Test (timeout=300000)
+<a class="jxr_linenumber" name="338" href="#338">338</a> @Test
<a class="jxr_linenumber" name="339" href="#339">339</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTakeSnapshotAfterMerge() <strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="340" href="#340">340</a> <strong class="jxr_keyword">int</strong> numRows = DEFAULT_NUM_ROWS;
-<a class="jxr_linenumber" name="341" href="#341">341</a> Admin admin = UTIL.getHBaseAdmin();
-<a class="jxr_linenumber" name="342" href="#342">342</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
-<a class="jxr_linenumber" name="343" href="#343">343</a> SnapshotTestingUtils.assertNoSnapshots(admin);
-<a class="jxr_linenumber" name="344" href="#344">344</a> <em class="jxr_comment">// load the table so we have some data</em>
-<a class="jxr_linenumber" name="345" href="#345">345</a> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, numRows, TEST_FAM);
-<a class="jxr_linenumber" name="346" href="#346">346</a>
-<a class="jxr_linenumber" name="347" href="#347">347</a> <em class="jxr_comment">// Merge two regions</em>
-<a class="jxr_linenumber" name="348" href="#348">348</a> List<HRegionInfo> regions = admin.getTableRegions(TABLE_NAME);
-<a class="jxr_linenumber" name="349" href="#349">349</a> Collections.sort(regions, <strong class="jxr_keyword">new</strong> Comparator<HRegionInfo>() {
-<a class="jxr_linenumber" name="350" href="#350">350</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> compare(HRegionInfo r1, HRegionInfo r2) {
-<a class="jxr_linenumber" name="351" href="#351">351</a> <strong class="jxr_keyword">return</strong> Bytes.compareTo(r1.getStartKey(), r2.getStartKey());
-<a class="jxr_linenumber" name="352" href="#352">352</a> }
-<a class="jxr_linenumber" name="353" href="#353">353</a> });
-<a class="jxr_linenumber" name="354" href="#354">354</a>
-<a class="jxr_linenumber" name="355" href="#355">355</a> <strong class="jxr_keyword">int</strong> numRegions = admin.getTableRegions(TABLE_NAME).size();
-<a class="jxr_linenumber" name="356" href="#356">356</a> <strong class="jxr_keyword">int</strong> numRegionsAfterMerge = numRegions - 2;
-<a class="jxr_linenumber" name="357" href="#357">357</a> admin.mergeRegions(regions.get(1).getEncodedNameAsBytes(),
-<a class="jxr_linenumber" name="358" href="#358">358</a> regions.get(2).getEncodedNameAsBytes(), <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="359" href="#359">359</a> admin.mergeRegions(regions.get(5).getEncodedNameAsBytes(),
-<a class="jxr_linenumber" name="360" href="#360">360</a> regions.get(6).getEncodedNameAsBytes(), <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="361" href="#361">361</a>
-<a class="jxr_linenumber" name="362" href="#362">362</a> waitRegionsAfterMerge(numRegionsAfterMerge);
-<a class="jxr_linenumber" name="363" href="#363">363</a> assertEquals(numRegionsAfterMerge, admin.getTableRegions(TABLE_NAME).size());
-<a class="jxr_linenumber" name="364" href="#364">364</a>
-<a class="jxr_linenumber" name="365" href="#365">365</a> <em class="jxr_comment">// Take a snapshot</em>
-<a class="jxr_linenumber" name="366" href="#366">366</a> String snapshotName = <span class="jxr_string">"snapshotAfterMerge"</span>;
-<a class="jxr_linenumber" name="367" href="#367">367</a> SnapshotTestingUtils.snapshot(admin, snapshotName, TABLE_NAME.getNameAsString(),
-<a class="jxr_linenumber" name="368" href="#368">368</a> SnapshotDescription.Type.FLUSH, 3);
-<a class="jxr_linenumber" name="369" href="#369">369</a>
-<a class="jxr_linenumber" name="370" href="#370">370</a> <em class="jxr_comment">// Clone the table</em>
-<a class="jxr_linenumber" name="371" href="#371">371</a> TableName cloneName = TableName.valueOf(<span class="jxr_string">"cloneMerge"</span>);
-<a class="jxr_linenumber" name="372" href="#372">372</a> admin.cloneSnapshot(snapshotName, cloneName);
-<a class="jxr_linenumber" name="373" href="#373">373</a> SnapshotTestingUtils.waitForTableToBeOnline(UTIL, cloneName);
-<a class="jxr_linenumber" name="374" href="#374">374</a>
-<a class="jxr_linenumber" name="375" href="#375">375</a> verifyRowCount(UTIL, TABLE_NAME, numRows);
-<a class="jxr_linenumber" name="376" href="#376">376</a> verifyRowCount(UTIL, cloneName, numRows);
-<a class="jxr_linenumber" name="377" href="#377">377</a>
-<a class="jxr_linenumber" name="378" href="#378">378</a> <em class="jxr_comment">// test that we can delete the snapshot</em>
-<a class="jxr_linenumber" name="379" href="#379">379</a> UTIL.deleteTable(cloneName);
-<a class="jxr_linenumber" name="380" href="#380">380</a> }
-<a class="jxr_linenumber" name="381" href="#381">381</a>
-<a class="jxr_linenumber" name="382" href="#382">382</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="383" href="#383">383</a> <em class="jxr_javadoccomment"> * Basic end-to-end test of simple-flush-based snapshots</em>
-<a class="jxr_linenumber" name="384" href="#384">384</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="385" href="#385">385</a> @Test (timeout=300000)
-<a class="jxr_linenumber" name="386" href="#386">386</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFlushCreateListDestroy() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="387" href="#387">387</a> LOG.debug(<span class="jxr_string">"------- Starting Snapshot test -------------"</span>);
-<a class="jxr_linenumber" name="388" href="#388">388</a> Admin admin = UTIL.getHBaseAdmin();
-<a class="jxr_linenumber" name="389" href="#389">389</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
-<a class="jxr_linenumber" name="390" href="#390">390</a> SnapshotTestingUtils.assertNoSnapshots(admin);
-<a class="jxr_linenumber" name="391" href="#391">391</a> <em class="jxr_comment">// load the table so we have some data</em>
-<a class="jxr_linenumber" name="392" href="#392">392</a> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);
-<a class="jxr_linenumber" name="393" href="#393">393</a>
-<a class="jxr_linenumber" name="394" href="#394">394</a> String snapshotName = <span class="jxr_string">"flushSnapshotCreateListDestroy"</span>;
-<a class="jxr_linenumber" name="395" href="#395">395</a> FileSystem fs = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getFileSystem();
-<a class="jxr_linenumber" name="396" href="#396">396</a> Path rootDir = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir();
-<a class="jxr_linenumber" name="397" href="#397">397</a> SnapshotTestingUtils.createSnapshotAndValidate(admin, TABLE_NAME, Bytes.toString(TEST_FAM),
-<a class="jxr_linenumber" name="398" href="#398">398</a> snapshotName, rootDir, fs, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="399" href="#399">399</a> }
-<a class="jxr_linenumber" name="400" href="#400">400</a>
-<a class="jxr_linenumber" name="401" href="#401">401</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="402" href="#402">402</a> <em class="jxr_javadoccomment"> * Demonstrate that we reject snapshot requests if there is a snapshot already running on the</em>
-<a class="jxr_linenumber" name="403" href="#403">403</a> <em class="jxr_javadoccomment"> * same table currently running and that concurrent snapshots on different tables can both</em>
-<a class="jxr_linenumber" name="404" href="#404">404</a> <em class="jxr_javadoccomment"> * succeed concurretly.</em>
-<a class="jxr_linenumber" name="405" href="#405">405</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="406" href="#406">406</a> @Test(timeout=300000)
-<a class="jxr_linenumber" name="407" href="#407">407</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testConcurrentSnapshottingAttempts() <strong class="jxr_keyword">throws</strong> IOException, InterruptedException {
-<a class="jxr_linenumber" name="408" href="#408">408</a> <strong class="jxr_keyword">final</strong> TableName TABLE2_NAME = TableName.valueOf(TABLE_NAME + <span class="jxr_string">"2"</span>);
-<a class="jxr_linenumber" name="409" href="#409">409</a>
-<a class="jxr_linenumber" name="410" href="#410">410</a> <strong class="jxr_keyword">int</strong> ssNum = 20;
-<a class="jxr_linenumber" name="411" href="#411">411</a> Admin admin = UTIL.getHBaseAdmin();
-<a class="jxr_linenumber" name="412" href="#412">412</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
-<a class="jxr_linenumber" name="413" href="#413">413</a> SnapshotTestingUtils.assertNoSnapshots(admin);
-<a class="jxr_linenumber" name="414" href="#414">414</a> <em class="jxr_comment">// create second testing table</em>
-<a class="jxr_linenumber" name="415" href="#415">415</a> SnapshotTestingUtils.createTable(UTIL, TABLE2_NAME, TEST_FAM);
-<a class="jxr_linenumber" name="416" href="#416">416</a> <em class="jxr_comment">// load the table so we have some data</em>
-<a class="jxr_linenumber" name="417" href="#417">417</a> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);
-<a class="jxr_linenumber" name="418" href="#418">418</a> SnapshotTestingUtils.loadData(UTIL, TABLE2_NAME, DEFAULT_NUM_ROWS, TEST_FAM);
-<a class="jxr_linenumber" name="419" href="#419">419</a>
-<a class="jxr_linenumber" name="420" href="#420">420</a> <strong class="jxr_keyword">final</strong> CountDownLatch toBeSubmitted = <strong class="jxr_keyword">new</strong> CountDownLatch(ssNum);
-<a class="jxr_linenumber" name="421" href="#421">421</a> <em class="jxr_comment">// We'll have one of these per thread</em>
-<a class="jxr_linenumber" name="422" href="#422">422</a> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html">SSRunnable</a> <strong class="jxr_keyword">implements</strong> Runnable {
-<a class="jxr_linenumber" name="423" href="#423">423</a> SnapshotDescription ss;
-<a class="jxr_linenumber" name="424" href="#424">424</a> <a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html">SSRunnable</a>(SnapshotDescription ss) {
-<a class="jxr_linenumber" name="425" href="#425">425</a> <strong class="jxr_keyword">this</strong>.ss = ss;
-<a class="jxr_linenumber" name="426" href="#426">426</a> }
-<a class="jxr_linenumber" name="427" href="#427">427</a>
-<a class="jxr_linenumber" name="428" href="#428">428</a> @Override
-<a class="jxr_linenumber" name="429" href="#429">429</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> run() {
-<a class="jxr_linenumber" name="430" href="#430">430</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="431" href="#431">431</a> Admin admin = UTIL.getHBaseAdmin();
-<a class="jxr_linenumber" name="432" href="#432">432</a> LOG.info(<span class="jxr_string">"Submitting snapshot request: "</span> + ClientSnapshotDescriptionUtils.toString(ss));
-<a class="jxr_linenumber" name="433" href="#433">433</a> admin.takeSnapshotAsync(ss);
-<a class="jxr_linenumber" name="434" href="#434">434</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="435" href="#435">435</a> LOG.info(<span class="jxr_string">"Exception during snapshot request: "</span> + ClientSnapshotDescriptionUtils.toString(
-<a class="jxr_linenumber" name="436" href="#436">436</a> ss)
-<a class="jxr_linenumber" name="437" href="#437">437</a> + <span class="jxr_string">". This is ok, we expect some"</span>, e);
-<a class="jxr_linenumber" name="438" href="#438">438</a> }
-<a class="jxr_linenumber" name="439" href="#439">439</a> LOG.info(<span class="jxr_string">"Submitted snapshot request: "</span> + ClientSnapshotDescriptionUtils.toString(ss));
-<a class="jxr_linenumber" name="440" href="#440">440</a> toBeSubmitted.countDown();
-<a class="jxr_linenumber" name="441" href="#441">441</a> }
-<a class="jxr_linenumber" name="442" href="#442">442</a> };
-<a class="jxr_linenumber" name="443" href="#443">443</a>
-<a class="jxr_linenumber" name="444" href="#444">444</a> <em class="jxr_comment">// build descriptions</em>
-<a class="jxr_linenumber" name="445" href="#445">445</a> SnapshotDescription[] descs = <strong class="jxr_keyword">new</strong> SnapshotDescription[ssNum];
-<a class="jxr_linenumber" name="446" href="#446">446</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < ssNum; i++) {
-<a class="jxr_linenumber" name="447" href="#447">447</a> SnapshotDescription.Builder builder = SnapshotDescription.newBuilder();
-<a class="jxr_linenumber" name="448" href="#448">448</a> builder.setTable(((i % 2) == 0 ? TABLE_NAME : TABLE2_NAME).getNameAsString());
-<a class="jxr_linenumber" name="449" href="#449">449</a> builder.setName(<span class="jxr_string">"ss"</span>+i);
-<a class="jxr_linenumber" name="450" href="#450">450</a> builder.setType(SnapshotDescription.Type.FLUSH);
-<a class="jxr_linenumber" name="451" href="#451">451</a> descs[i] = builder.build();
-<a class="jxr_linenumber" name="452" href="#452">452</a> }
-<a class="jxr_linenumber" name="453" href="#453">453</a>
-<a class="jxr_linenumber" name="454" href="#454">454</a> <em class="jxr_comment">// kick each off its own thread</em>
-<a class="jxr_linenumber" name="455" href="#455">455</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i=0 ; i < ssNum; i++) {
-<a class="jxr_linenumber" name="456" href="#456">456</a> <strong class="jxr_keyword">new</strong> Thread(<strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html">SSRunnable</a>(descs[i])).start();
-<a class="jxr_linenumber" name="457" href="#457">457</a> }
-<a class="jxr_linenumber" name="458" href="#458">458</a>
-<a class="jxr_linenumber" name="459" href="#459">459</a> <em class="jxr_comment">// wait until all have been submitted</em>
-<a class="jxr_linenumber" name="460" href="#460">460</a> toBeSubmitted.await();
-<a class="jxr_linenumber" name="461" href="#461">461</a>
-<a class="jxr_linenumber" name="462" href="#462">462</a> <em class="jxr_comment">// loop until all are done.</em>
-<a class="jxr_linenumber" name="463" href="#463">463</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
-<a class="jxr_linenumber" name="464" href="#464">464</a> <strong class="jxr_keyword">int</strong> doneCount = 0;
-<a class="jxr_linenumber" name="465" href="#465">465</a> <strong class="jxr_keyword">for</strong> (SnapshotDescription ss : descs) {
-<a class="jxr_linenumber" name="466" href="#466">466</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="467" href="#467">467</a> <strong class="jxr_keyword">if</strong> (admin.isSnapshotFinished(ss)) {
-<a class="jxr_linenumber" name="468" href="#468">468</a> doneCount++;
-<a class="jxr_linenumber" name="469" href="#469">469</a> }
-<a class="jxr_linenumber" name="470" href="#470">470</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="471" href="#471">471</a> LOG.warn(<span class="jxr_string">"Got an exception when checking for snapshot "</span> + ss.getName(), e);
-<a class="jxr_linenumber" name="472" href="#472">472</a> doneCount++;
-<a class="jxr_linenumber" name="473" href="#473">473</a> }
-<a class="jxr_linenumber" name="474" href="#474">474</a> }
-<a class="jxr_linenumber" name="475" href="#475">475</a> <strong class="jxr_keyword">if</strong> (doneCount == descs.length) {
-<a class="jxr_linenumber" name="476" href="#476">476</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="477" href="#477">477</a> }
-<a class="jxr_linenumber" name="478" href="#478">478</a> Thread.sleep(100);
-<a class="jxr_linenumber" name="479" href="#479">479</a> }
-<a class="jxr_linenumber" name="480" href="#480">480</a>
-<a class="jxr_linenumber" name="481" href="#481">481</a> <em class="jxr_comment">// dump for debugging</em>
-<a class="jxr_linenumber" name="482" href="#482">482</a> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);
-<a class="jxr_linenumber" name="483" href="#483">483</a>
-<a class="jxr_linenumber" name="484" href="#484">484</a> List<SnapshotDescription> taken = admin.listSnapshots();
-<a class="jxr_linenumber" name="485" href="#485">485</a> <strong class="jxr_keyword">int</strong> takenSize = taken.size();
-<a class="jxr_linenumber" name="486" href="#486">486</a> LOG.info(<span class="jxr_string">"Taken "</span> + takenSize + <span class="jxr_string">" snapshots: "</span> + taken);
-<a class="jxr_linenumber" name="487" href="#487">487</a> assertTrue(<span class="jxr_string">"We expect at least 1 request to be rejected because of we concurrently"</span> +
-<a class="jxr_linenumber" name="488" href="#488">488</a> <span class="jxr_string">" issued many requests"</span>, takenSize < ssNum && takenSize > 0);
-<a class="jxr_linenumber" name="489" href="#489">489</a>
-<a class="jxr_linenumber" name="490" href="#490">490</a> <em class="jxr_comment">// Verify that there's at least one snapshot per table</em>
-<a class="jxr_linenumber" name="491" href="#491">491</a> <strong class="jxr_keyword">int</strong> t1SnapshotsCount = 0;
-<a class="jxr_linenumber" name="492" href="#492">492</a> <strong class="jxr_keyword">int</strong> t2SnapshotsCount = 0;
-<a class="jxr_linenumber" name="493" href="#493">493</a> <strong class="jxr_keyword">for</strong> (SnapshotDescription ss : taken) {
-<a class="jxr_linenumber" name="494" href="#494">494</a> <strong class="jxr_keyword">if</strong> (TableName.valueOf(ss.getTable()).equals(TABLE_NAME)) {
-<a class="jxr_linenumber" name="495" href="#495">495</a> t1SnapshotsCount++;
-<a class="jxr_linenumber" name="496" href="#496">496</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (TableName.valueOf(ss.getTable()).equals(TABLE2_NAME)) {
-<a class="jxr_linenumber" name="497" href="#497">497</a> t2SnapshotsCount++;
-<a class="jxr_linenumber" name="498" href="#498">498</a> }
-<a class="jxr_linenumber" name="499" href="#499">499</a> }
-<a class="jxr_linenumber" name="500" href="#500">500</a> assertTrue(<span class="jxr_string">"We expect at least 1 snapshot of table1 "</span>, t1SnapshotsCount > 0);
-<a class="jxr_linenumber" name="501" href="#501">501</a> assertTrue(<span class="jxr_string">"We expect at least 1 snapshot of table2 "</span>, t2SnapshotsCount > 0);
-<a class="jxr_linenumber" name="502" href="#502">502</a>
-<a class="jxr_linenumber" name="503" href="#503">503</a> UTIL.deleteTable(TABLE2_NAME);
-<a class="jxr_linenumber" name="504" href="#504">504</a> }
-<a class="jxr_linenumber" name="505" href="#505">505</a>
-<a class="jxr_linenumber" name="506" href="#506">506</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> waitRegionsAfterMerge(<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">long</strong> numRegionsAfterMerge)
-<a class="jxr_linenumber" name="507" href="#507">507</a> <strong class="jxr_keyword">throws</strong> IOException, InterruptedException {
-<a class="jxr_linenumber" name="508" href="#508">508</a> Admin admin = UTIL.getHBaseAdmin();
-<a class="jxr_linenumber" name="509" href="#509">509</a> <em class="jxr_comment">// Verify that there's one region less</em>
-<a class="jxr_linenumber" name="510" href="#510">510</a> <strong class="jxr_keyword">long</strong> startTime = System.currentTimeMillis();
-<a class="jxr_linenumber" name="511" href="#511">511</a> <strong class="jxr_keyword">while</strong> (admin.getTableRegions(TABLE_NAME).size() != numRegionsAfterMerge) {
-<a class="jxr_linenumber" name="512" href="#512">512</a> <em class="jxr_comment">// This may be flaky... if after 15sec the merge is not complete give up</em>
-<a class="jxr_linenumber" name="513" href="#513">513</a> <em class="jxr_comment">// it will fail in the assertEquals(numRegionsAfterMerge).</em>
-<a class="jxr_linenumber" name="514" href="#514">514</a> <strong class="jxr_keyword">if</strong> ((System.currentTimeMillis() - startTime) > 15000)
-<a class="jxr_linenumber" name="515" href="#515">515</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="516" href="#516">516</a> Thread.sleep(100);
-<a class="jxr_linenumber" name="517" href="#517">517</a> }
-<a class="jxr_linenumber" name="518" href="#518">518</a> SnapshotTestingUtils.waitForTableToBeOnline(UTIL, TABLE_NAME);
-<a class="jxr_linenumber" name="519" href="#519">519</a> }
-<a class="jxr_linenumber" name="520" href="#520">520</a>
+<a class="jxr_linenumber" name="341" href="#341">341</a> <em class="jxr_comment">// make sure we don't fail on listing snapshots</em>
+<a class="jxr_linenumber" name="342" href="#342">342</a> SnapshotTestingUtils.assertNoSnapshots(admin);
+<a class="jxr_linenumber" name="343" href="#343">343</a> <em class="jxr_comment">// load the table so we have some data</em>
+<a class="jxr_linenumber" name="344" href="#344">344</a> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, numRows, TEST_FAM);
+<a class="jxr_linenumber" name="345" href="#345">345</a>
+<a class="jxr_linenumber" name="346" href="#346">346</a> <em class="jxr_comment">// Merge two regions</em>
+<a class="jxr_linenumber" name="347" href="#347">347</a> List<HRegionInfo> regions = admin.getTableRegions(TABLE_NAME);
+<a class="jxr_linenumber" name="348" href="#348">348</a> Collections.sort(regions, <strong class="jxr_keyword">new</strong> Comparator<HRegionInfo>() {
+<a class="jxr_linenumber" name="349" href="#349">349</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> compare(HRegionInfo r1, HRegionInfo r2) {
+<a class="jxr_linenumber" name="350" href="#350">350</a> <strong class="jxr_keyword">return</strong> Bytes.compareTo(r1.getStartKey(), r2.getStartKey());
+<a class="jxr_linenumber" name="351" href="#351">351</a> }
+<a class="jxr_linenumber" name="352" href="#352">352</a> });
+<a class="jxr_linenumber" name="353" href="#353">353</a>
+<a class="jxr_linenumber" name="354" href="#354">354</a> <strong class="jxr_keyword">int</strong> numRegions = admin.getTableRegions(TABLE_NAME).size();
+<a class="jxr_linenumber" name="355" href="#355">355</a> <strong class="jxr_keyword">int</strong> numRegionsAfterMerge = numRegions - 2;
+<a class="jxr_linenumber" name="356" href="#356">356</a> admin.mergeRegions(regions.get(1).getEncodedNameAsBytes(),
+<a class="jxr_linenumber" name="357" href="#357">357</a> regions.get(2).getEncodedNameAsBytes(), <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="358" href="#358">358</a> admin.mergeRegions(regions.get(5).getEncodedNameAsBytes(),
+<a class="jxr_linenumber" name="359" href="#359">359</a> regions.get(6).getEncodedNameAsBytes(), <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="360" href="#360">360</a>
+<a class="jxr_linenumber" name="361" href="#361">361</a> waitRegionsAfterMerge(numRegionsAfterMerge);
+<a class="jxr_linenumber" name="362" href="#362">362</a> assertEquals(numRegionsAfterMerge, admin.getTableRegions(TABLE_NAME).size());
+<a class="jxr_linenumber" name="363" href="#363">363</a>
+<a class="jxr_linenumber" name="364" href="#364">364</a> <em class="jxr_comment">// Take a snapshot</em>
+<a class="jxr_linenumber" name="365" href="#365">365</a> String snapshotName = <span class="jxr_string">"snapshotAfterMerge"</span>;
+<a class="jxr_linenumber" name="366" href="#366">366</a> SnapshotTestingUtils.snapshot(admin, snapshotName, TABLE_NAME.getNameAsString(),
+<a class="jxr_linenumber" name="367" href="#367">367</a> SnapshotDescription.Type.FLUSH, 3);
+<a class="jxr_linenumber" name="368" href="#368">368</a>
+<a class="jxr_linenumber" name="369" href="#369">369</a> <em class="jxr_comment">// Clone the table</em>
+<a class="jxr_linenumber" name="370" href="#370">370</a> TableName cloneName = TableName.valueOf(<span class="jxr_string">"cloneMerge"</span>);
+<a class="jxr_linenumber" name="371" href="#371">371</a> admin.cloneSnapshot(snapshotName, cloneName);
+<a class="jxr_linenumber" name="372" href="#372">372</a> SnapshotTestingUtils.waitForTableToBeOnline(UTIL, cloneName);
+<a class="jxr_linenumber" name="373" href="#373">373</a>
+<a class="jxr_linenumber" name="374" href="#374">374</a> verifyRowCount(UTIL, TABLE_NAME, numRows);
+<a class="jxr_linenumber" name="375" href="#375">375</a> verifyRowCount(UTIL, cloneName, numRows);
+<a class="jxr_linenumber" name="376" href="#376">376</a>
+<a class="jxr_linenumber" name="377" href="#377">377</a> <em class="jxr_comment">// test that we can delete the snapshot</em>
+<a class="jxr_linenumber" name="378" href="#378">378</a> UTIL.deleteTable(cloneName);
+<a class="jxr_linenumber" name="379" href="#379">379</a> }
+<a class="jxr_linenumber" name="380" href="#380">380</a>
+<a class="jxr_linenumber" name="381" href="#381">381</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="382" href="#382">382</a> <em class="jxr_javadoccomment"> * Basic end-to-end test of simple-flush-based snapshots</em>
+<a class="jxr_linenumber" name="383" href="#383">383</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="384" href="#384">384</a> @Test
+<a class="jxr_linenumber" name="385" href="#385">385</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFlushCreateListDestroy() <strong class="jxr_keyword">throws</strong> Exception {
+<a clas
<TRUNCATED>
[02/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
index a340bd2..e227a2f 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
@@ -69,15 +69,15 @@
<a class="jxr_linenumber" name="59" href="#59">59</a> requiredArguments = {
<a class="jxr_linenumber" name="60" href="#60">60</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"master"</span>, type = <span class="jxr_string">"HMaster"</span>)},
<a class="jxr_linenumber" name="61" href="#61">61</a> optionalArguments = {
-<a class="jxr_linenumber" name="62" href="#62">62</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="63" href="#63">63</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"catalogJanitorEnabled"</span>, type = <span class="jxr_string">"boolean"</span>),
+<a class="jxr_linenumber" name="62" href="#62">62</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"metaLocation"</span>, type = <span class="jxr_string">"ServerName"</span>),
+<a class="jxr_linenumber" name="63" href="#63">63</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"serverManager"</span>, type = <span class="jxr_string">"ServerManager"</span>),
<a class="jxr_linenumber" name="64" href="#64">64</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"frags"</span>, type = <span class="jxr_string">"Map<String,Integer>"</span>),
-<a class="jxr_linenumber" name="65" href="#65">65</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="66" href="#66">66</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"assignmentManager"</span>, type = <span class="jxr_string">"AssignmentManager"</span>),
-<a class="jxr_linenumber" name="67" href="#67">67</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"serverManager"</span>, type = <span class="jxr_string">"ServerManager"</span>),
-<a class="jxr_linenumber" name="68" href="#68">68</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"deadServers"</span>, type = <span class="jxr_string">"Set<ServerName>"</span>),
-<a class="jxr_linenumber" name="69" href="#69">69</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"servers"</span>, type = <span class="jxr_string">"List<ServerName>"</span>),
-<a class="jxr_linenumber" name="70" href="#70">70</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"metaLocation"</span>, type = <span class="jxr_string">"ServerName"</span>)})
+<a class="jxr_linenumber" name="65" href="#65">65</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"assignmentManager"</span>, type = <span class="jxr_string">"AssignmentManager"</span>),
+<a class="jxr_linenumber" name="66" href="#66">66</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="67" href="#67">67</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"catalogJanitorEnabled"</span>, type = <span class="jxr_string">"boolean"</span>),
+<a class="jxr_linenumber" name="68" href="#68">68</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="69" href="#69">69</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"deadServers"</span>, type = <span class="jxr_string">"Set<ServerName>"</span>),
+<a class="jxr_linenumber" name="70" href="#70">70</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"servers"</span>, type = <span class="jxr_string">"List<ServerName>"</span>)})
<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html">MasterStatusTmpl</a>
<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy
<a class="jxr_linenumber" name="73" href="#73">73</a> {
@@ -118,40 +118,40 @@
<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">return</strong> m_master;
<a class="jxr_linenumber" name="109" href="#109">109</a> }
<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html">HMaster</a> m_master;
-<a class="jxr_linenumber" name="111" href="#111">111</a> <em class="jxr_comment">// 27, 1</em>
-<a class="jxr_linenumber" name="112" href="#112">112</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
+<a class="jxr_linenumber" name="111" href="#111">111</a> <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="112" href="#112">112</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation)
<a class="jxr_linenumber" name="113" href="#113">113</a> {
-<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_comment">// 27, 1</em>
-<a class="jxr_linenumber" name="115" href="#115">115</a> m_format = format;
-<a class="jxr_linenumber" name="116" href="#116">116</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="115" href="#115">115</a> m_metaLocation = metaLocation;
+<a class="jxr_linenumber" name="116" href="#116">116</a> m_metaLocation__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="117" href="#117">117</a> }
-<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> String getFormat()
+<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> getMetaLocation()
<a class="jxr_linenumber" name="119" href="#119">119</a> {
-<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">return</strong> m_format;
+<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">return</strong> m_metaLocation;
<a class="jxr_linenumber" name="121" href="#121">121</a> }
-<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">private</strong> String m_format;
-<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
+<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> m_metaLocation;
+<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getMetaLocation__IsNotDefault()
<a class="jxr_linenumber" name="124" href="#124">124</a> {
-<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">return</strong> m_metaLocation__IsNotDefault;
<a class="jxr_linenumber" name="126" href="#126">126</a> }
-<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
-<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_comment">// 25, 1</em>
-<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setCatalogJanitorEnabled(<strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled)
+<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_metaLocation__IsNotDefault;
+<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_comment">// 28, 1</em>
+<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager)
<a class="jxr_linenumber" name="130" href="#130">130</a> {
-<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_comment">// 25, 1</em>
-<a class="jxr_linenumber" name="132" href="#132">132</a> m_catalogJanitorEnabled = catalogJanitorEnabled;
-<a class="jxr_linenumber" name="133" href="#133">133</a> m_catalogJanitorEnabled__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_comment">// 28, 1</em>
+<a class="jxr_linenumber" name="132" href="#132">132</a> m_serverManager = serverManager;
+<a class="jxr_linenumber" name="133" href="#133">133</a> m_serverManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="134" href="#134">134</a> }
-<a class="jxr_linenumber" name="135" href="#135">135</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getCatalogJanitorEnabled()
+<a class="jxr_linenumber" name="135" href="#135">135</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> getServerManager()
<a class="jxr_linenumber" name="136" href="#136">136</a> {
-<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">return</strong> m_catalogJanitorEnabled;
+<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">return</strong> m_serverManager;
<a class="jxr_linenumber" name="138" href="#138">138</a> }
-<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_catalogJanitorEnabled;
-<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getCatalogJanitorEnabled__IsNotDefault()
+<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> m_serverManager;
+<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServerManager__IsNotDefault()
<a class="jxr_linenumber" name="141" href="#141">141</a> {
-<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">return</strong> m_catalogJanitorEnabled__IsNotDefault;
+<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">return</strong> m_serverManager__IsNotDefault;
<a class="jxr_linenumber" name="143" href="#143">143</a> }
-<a class="jxr_linenumber" name="144" href="#144">144</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_catalogJanitorEnabled__IsNotDefault;
+<a class="jxr_linenumber" name="144" href="#144">144</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_serverManager__IsNotDefault;
<a class="jxr_linenumber" name="145" href="#145">145</a> <em class="jxr_comment">// 21, 1</em>
<a class="jxr_linenumber" name="146" href="#146">146</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFrags(Map<String,Integer> frags)
<a class="jxr_linenumber" name="147" href="#147">147</a> {
@@ -169,108 +169,108 @@
<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">return</strong> m_frags__IsNotDefault;
<a class="jxr_linenumber" name="160" href="#160">160</a> }
<a class="jxr_linenumber" name="161" href="#161">161</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_frags__IsNotDefault;
-<a class="jxr_linenumber" name="162" href="#162">162</a> <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="163" href="#163">163</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
+<a class="jxr_linenumber" name="162" href="#162">162</a> <em class="jxr_comment">// 29, 1</em>
+<a class="jxr_linenumber" name="163" href="#163">163</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager)
<a class="jxr_linenumber" name="164" href="#164">164</a> {
-<a class="jxr_linenumber" name="165" href="#165">165</a> <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="166" href="#166">166</a> m_filter = filter;
-<a class="jxr_linenumber" name="167" href="#167">167</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="165" href="#165">165</a> <em class="jxr_comment">// 29, 1</em>
+<a class="jxr_linenumber" name="166" href="#166">166</a> m_assignmentManager = assignmentManager;
+<a class="jxr_linenumber" name="167" href="#167">167</a> m_assignmentManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="168" href="#168">168</a> }
-<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">public</strong> String getFilter()
+<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> getAssignmentManager()
<a class="jxr_linenumber" name="170" href="#170">170</a> {
-<a class="jxr_linenumber" name="171" href="#171">171</a> <strong class="jxr_keyword">return</strong> m_filter;
+<a class="jxr_linenumber" name="171" href="#171">171</a> <strong class="jxr_keyword">return</strong> m_assignmentManager;
<a class="jxr_linenumber" name="172" href="#172">172</a> }
-<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">private</strong> String m_filter;
-<a class="jxr_linenumber" name="174" href="#174">174</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
+<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> m_assignmentManager;
+<a class="jxr_linenumber" name="174" href="#174">174</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getAssignmentManager__IsNotDefault()
<a class="jxr_linenumber" name="175" href="#175">175</a> {
-<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">return</strong> m_assignmentManager__IsNotDefault;
<a class="jxr_linenumber" name="177" href="#177">177</a> }
-<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
-<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_comment">// 29, 1</em>
-<a class="jxr_linenumber" name="180" href="#180">180</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager)
+<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_assignmentManager__IsNotDefault;
+<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_comment">// 27, 1</em>
+<a class="jxr_linenumber" name="180" href="#180">180</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
<a class="jxr_linenumber" name="181" href="#181">181</a> {
-<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_comment">// 29, 1</em>
-<a class="jxr_linenumber" name="183" href="#183">183</a> m_assignmentManager = assignmentManager;
-<a class="jxr_linenumber" name="184" href="#184">184</a> m_assignmentManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_comment">// 27, 1</em>
+<a class="jxr_linenumber" name="183" href="#183">183</a> m_format = format;
+<a class="jxr_linenumber" name="184" href="#184">184</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="185" href="#185">185</a> }
-<a class="jxr_linenumber" name="186" href="#186">186</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> getAssignmentManager()
+<a class="jxr_linenumber" name="186" href="#186">186</a> <strong class="jxr_keyword">public</strong> String getFormat()
<a class="jxr_linenumber" name="187" href="#187">187</a> {
-<a class="jxr_linenumber" name="188" href="#188">188</a> <strong class="jxr_keyword">return</strong> m_assignmentManager;
+<a class="jxr_linenumber" name="188" href="#188">188</a> <strong class="jxr_keyword">return</strong> m_format;
<a class="jxr_linenumber" name="189" href="#189">189</a> }
-<a class="jxr_linenumber" name="190" href="#190">190</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> m_assignmentManager;
-<a class="jxr_linenumber" name="191" href="#191">191</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getAssignmentManager__IsNotDefault()
+<a class="jxr_linenumber" name="190" href="#190">190</a> <strong class="jxr_keyword">private</strong> String m_format;
+<a class="jxr_linenumber" name="191" href="#191">191</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
<a class="jxr_linenumber" name="192" href="#192">192</a> {
-<a class="jxr_linenumber" name="193" href="#193">193</a> <strong class="jxr_keyword">return</strong> m_assignmentManager__IsNotDefault;
+<a class="jxr_linenumber" name="193" href="#193">193</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
<a class="jxr_linenumber" name="194" href="#194">194</a> }
-<a class="jxr_linenumber" name="195" href="#195">195</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_assignmentManager__IsNotDefault;
-<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_comment">// 28, 1</em>
-<a class="jxr_linenumber" name="197" href="#197">197</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager)
+<a class="jxr_linenumber" name="195" href="#195">195</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_comment">// 25, 1</em>
+<a class="jxr_linenumber" name="197" href="#197">197</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setCatalogJanitorEnabled(<strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled)
<a class="jxr_linenumber" name="198" href="#198">198</a> {
-<a class="jxr_linenumber" name="199" href="#199">199</a> <em class="jxr_comment">// 28, 1</em>
-<a class="jxr_linenumber" name="200" href="#200">200</a> m_serverManager = serverManager;
-<a class="jxr_linenumber" name="201" href="#201">201</a> m_serverManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="199" href="#199">199</a> <em class="jxr_comment">// 25, 1</em>
+<a class="jxr_linenumber" name="200" href="#200">200</a> m_catalogJanitorEnabled = catalogJanitorEnabled;
+<a class="jxr_linenumber" name="201" href="#201">201</a> m_catalogJanitorEnabled__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="202" href="#202">202</a> }
-<a class="jxr_linenumber" name="203" href="#203">203</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> getServerManager()
+<a class="jxr_linenumber" name="203" href="#203">203</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getCatalogJanitorEnabled()
<a class="jxr_linenumber" name="204" href="#204">204</a> {
-<a class="jxr_linenumber" name="205" href="#205">205</a> <strong class="jxr_keyword">return</strong> m_serverManager;
+<a class="jxr_linenumber" name="205" href="#205">205</a> <strong class="jxr_keyword">return</strong> m_catalogJanitorEnabled;
<a class="jxr_linenumber" name="206" href="#206">206</a> }
-<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> m_serverManager;
-<a class="jxr_linenumber" name="208" href="#208">208</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServerManager__IsNotDefault()
+<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_catalogJanitorEnabled;
+<a class="jxr_linenumber" name="208" href="#208">208</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getCatalogJanitorEnabled__IsNotDefault()
<a class="jxr_linenumber" name="209" href="#209">209</a> {
-<a class="jxr_linenumber" name="210" href="#210">210</a> <strong class="jxr_keyword">return</strong> m_serverManager__IsNotDefault;
+<a class="jxr_linenumber" name="210" href="#210">210</a> <strong class="jxr_keyword">return</strong> m_catalogJanitorEnabled__IsNotDefault;
<a class="jxr_linenumber" name="211" href="#211">211</a> }
-<a class="jxr_linenumber" name="212" href="#212">212</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_serverManager__IsNotDefault;
-<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_comment">// 24, 1</em>
-<a class="jxr_linenumber" name="214" href="#214">214</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDeadServers(Set<ServerName> deadServers)
+<a class="jxr_linenumber" name="212" href="#212">212</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_catalogJanitorEnabled__IsNotDefault;
+<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_comment">// 26, 1</em>
+<a class="jxr_linenumber" name="214" href="#214">214</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
<a class="jxr_linenumber" name="215" href="#215">215</a> {
-<a class="jxr_linenumber" name="216" href="#216">216</a> <em class="jxr_comment">// 24, 1</em>
-<a class="jxr_linenumber" name="217" href="#217">217</a> m_deadServers = deadServers;
-<a class="jxr_linenumber" name="218" href="#218">218</a> m_deadServers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="216" href="#216">216</a> <em class="jxr_comment">// 26, 1</em>
+<a class="jxr_linenumber" name="217" href="#217">217</a> m_filter = filter;
+<a class="jxr_linenumber" name="218" href="#218">218</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="219" href="#219">219</a> }
-<a class="jxr_linenumber" name="220" href="#220">220</a> <strong class="jxr_keyword">public</strong> Set<ServerName> getDeadServers()
+<a class="jxr_linenumber" name="220" href="#220">220</a> <strong class="jxr_keyword">public</strong> String getFilter()
<a class="jxr_linenumber" name="221" href="#221">221</a> {
-<a class="jxr_linenumber" name="222" href="#222">222</a> <strong class="jxr_keyword">return</strong> m_deadServers;
+<a class="jxr_linenumber" name="222" href="#222">222</a> <strong class="jxr_keyword">return</strong> m_filter;
<a class="jxr_linenumber" name="223" href="#223">223</a> }
-<a class="jxr_linenumber" name="224" href="#224">224</a> <strong class="jxr_keyword">private</strong> Set<ServerName> m_deadServers;
-<a class="jxr_linenumber" name="225" href="#225">225</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getDeadServers__IsNotDefault()
+<a class="jxr_linenumber" name="224" href="#224">224</a> <strong class="jxr_keyword">private</strong> String m_filter;
+<a class="jxr_linenumber" name="225" href="#225">225</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
<a class="jxr_linenumber" name="226" href="#226">226</a> {
-<a class="jxr_linenumber" name="227" href="#227">227</a> <strong class="jxr_keyword">return</strong> m_deadServers__IsNotDefault;
+<a class="jxr_linenumber" name="227" href="#227">227</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
<a class="jxr_linenumber" name="228" href="#228">228</a> }
-<a class="jxr_linenumber" name="229" href="#229">229</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_deadServers__IsNotDefault;
-<a class="jxr_linenumber" name="230" href="#230">230</a> <em class="jxr_comment">// 23, 1</em>
-<a class="jxr_linenumber" name="231" href="#231">231</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServers(List<ServerName> servers)
+<a class="jxr_linenumber" name="229" href="#229">229</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="230" href="#230">230</a> <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="231" href="#231">231</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDeadServers(Set<ServerName> deadServers)
<a class="jxr_linenumber" name="232" href="#232">232</a> {
-<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_comment">// 23, 1</em>
-<a class="jxr_linenumber" name="234" href="#234">234</a> m_servers = servers;
-<a class="jxr_linenumber" name="235" href="#235">235</a> m_servers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="234" href="#234">234</a> m_deadServers = deadServers;
+<a class="jxr_linenumber" name="235" href="#235">235</a> m_deadServers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="236" href="#236">236</a> }
-<a class="jxr_linenumber" name="237" href="#237">237</a> <strong class="jxr_keyword">public</strong> List<ServerName> getServers()
+<a class="jxr_linenumber" name="237" href="#237">237</a> <strong class="jxr_keyword">public</strong> Set<ServerName> getDeadServers()
<a class="jxr_linenumber" name="238" href="#238">238</a> {
-<a class="jxr_linenumber" name="239" href="#239">239</a> <strong class="jxr_keyword">return</strong> m_servers;
+<a class="jxr_linenumber" name="239" href="#239">239</a> <strong class="jxr_keyword">return</strong> m_deadServers;
<a class="jxr_linenumber" name="240" href="#240">240</a> }
-<a class="jxr_linenumber" name="241" href="#241">241</a> <strong class="jxr_keyword">private</strong> List<ServerName> m_servers;
-<a class="jxr_linenumber" name="242" href="#242">242</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServers__IsNotDefault()
+<a class="jxr_linenumber" name="241" href="#241">241</a> <strong class="jxr_keyword">private</strong> Set<ServerName> m_deadServers;
+<a class="jxr_linenumber" name="242" href="#242">242</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getDeadServers__IsNotDefault()
<a class="jxr_linenumber" name="243" href="#243">243</a> {
-<a class="jxr_linenumber" name="244" href="#244">244</a> <strong class="jxr_keyword">return</strong> m_servers__IsNotDefault;
+<a class="jxr_linenumber" name="244" href="#244">244</a> <strong class="jxr_keyword">return</strong> m_deadServers__IsNotDefault;
<a class="jxr_linenumber" name="245" href="#245">245</a> }
-<a class="jxr_linenumber" name="246" href="#246">246</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_servers__IsNotDefault;
-<a class="jxr_linenumber" name="247" href="#247">247</a> <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="248" href="#248">248</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation)
+<a class="jxr_linenumber" name="246" href="#246">246</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_deadServers__IsNotDefault;
+<a class="jxr_linenumber" name="247" href="#247">247</a> <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="248" href="#248">248</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServers(List<ServerName> servers)
<a class="jxr_linenumber" name="249" href="#249">249</a> {
-<a class="jxr_linenumber" name="250" href="#250">250</a> <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="251" href="#251">251</a> m_metaLocation = metaLocation;
-<a class="jxr_linenumber" name="252" href="#252">252</a> m_metaLocation__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="250" href="#250">250</a> <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="251" href="#251">251</a> m_servers = servers;
+<a class="jxr_linenumber" name="252" href="#252">252</a> m_servers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="253" href="#253">253</a> }
-<a class="jxr_linenumber" name="254" href="#254">254</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> getMetaLocation()
+<a class="jxr_linenumber" name="254" href="#254">254</a> <strong class="jxr_keyword">public</strong> List<ServerName> getServers()
<a class="jxr_linenumber" name="255" href="#255">255</a> {
-<a class="jxr_linenumber" name="256" href="#256">256</a> <strong class="jxr_keyword">return</strong> m_metaLocation;
+<a class="jxr_linenumber" name="256" href="#256">256</a> <strong class="jxr_keyword">return</strong> m_servers;
<a class="jxr_linenumber" name="257" href="#257">257</a> }
-<a class="jxr_linenumber" name="258" href="#258">258</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> m_metaLocation;
-<a class="jxr_linenumber" name="259" href="#259">259</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getMetaLocation__IsNotDefault()
+<a class="jxr_linenumber" name="258" href="#258">258</a> <strong class="jxr_keyword">private</strong> List<ServerName> m_servers;
+<a class="jxr_linenumber" name="259" href="#259">259</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServers__IsNotDefault()
<a class="jxr_linenumber" name="260" href="#260">260</a> {
-<a class="jxr_linenumber" name="261" href="#261">261</a> <strong class="jxr_keyword">return</strong> m_metaLocation__IsNotDefault;
+<a class="jxr_linenumber" name="261" href="#261">261</a> <strong class="jxr_keyword">return</strong> m_servers__IsNotDefault;
<a class="jxr_linenumber" name="262" href="#262">262</a> }
-<a class="jxr_linenumber" name="263" href="#263">263</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_metaLocation__IsNotDefault;
+<a class="jxr_linenumber" name="263" href="#263">263</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_servers__IsNotDefault;
<a class="jxr_linenumber" name="264" href="#264">264</a> }
<a class="jxr_linenumber" name="265" href="#265">265</a> @Override
<a class="jxr_linenumber" name="266" href="#266">266</a> <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateProxy.ImplData makeImplData()
@@ -282,17 +282,17 @@
<a class="jxr_linenumber" name="272" href="#272">272</a> <strong class="jxr_keyword">return</strong> (ImplData) <strong class="jxr_keyword">super</strong>.getImplData();
<a class="jxr_linenumber" name="273" href="#273">273</a> }
<a class="jxr_linenumber" name="274" href="#274">274</a>
-<a class="jxr_linenumber" name="275" href="#275">275</a> <strong class="jxr_keyword">protected</strong> String format;
-<a class="jxr_linenumber" name="276" href="#276">276</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)
+<a class="jxr_linenumber" name="275" href="#275">275</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
+<a class="jxr_linenumber" name="276" href="#276">276</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> p_metaLocation)
<a class="jxr_linenumber" name="277" href="#277">277</a> {
-<a class="jxr_linenumber" name="278" href="#278">278</a> (getImplData()).setFormat(p_format);
+<a class="jxr_linenumber" name="278" href="#278">278</a> (getImplData()).setMetaLocation(p_metaLocation);
<a class="jxr_linenumber" name="279" href="#279">279</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="280" href="#280">280</a> }
<a class="jxr_linenumber" name="281" href="#281">281</a>
-<a class="jxr_linenumber" name="282" href="#282">282</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled;
-<a class="jxr_linenumber" name="283" href="#283">283</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(<strong class="jxr_keyword">boolean</strong> p_catalogJanitorEnabled)
+<a class="jxr_linenumber" name="282" href="#282">282</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
+<a class="jxr_linenumber" name="283" href="#283">283</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> p_serverManager)
<a class="jxr_linenumber" name="284" href="#284">284</a> {
-<a class="jxr_linenumber" name="285" href="#285">285</a> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);
+<a class="jxr_linenumber" name="285" href="#285">285</a> (getImplData()).setServerManager(p_serverManager);
<a class="jxr_linenumber" name="286" href="#286">286</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="287" href="#287">287</a> }
<a class="jxr_linenumber" name="288" href="#288">288</a>
@@ -303,45 +303,45 @@
<a class="jxr_linenumber" name="293" href="#293">293</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="294" href="#294">294</a> }
<a class="jxr_linenumber" name="295" href="#295">295</a>
-<a class="jxr_linenumber" name="296" href="#296">296</a> <strong class="jxr_keyword">protected</strong> String filter;
-<a class="jxr_linenumber" name="297" href="#297">297</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)
+<a class="jxr_linenumber" name="296" href="#296">296</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
+<a class="jxr_linenumber" name="297" href="#297">297</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> p_assignmentManager)
<a class="jxr_linenumber" name="298" href="#298">298</a> {
-<a class="jxr_linenumber" name="299" href="#299">299</a> (getImplData()).setFilter(p_filter);
+<a class="jxr_linenumber" name="299" href="#299">299</a> (getImplData()).setAssignmentManager(p_assignmentManager);
<a class="jxr_linenumber" name="300" href="#300">300</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="301" href="#301">301</a> }
<a class="jxr_linenumber" name="302" href="#302">302</a>
-<a class="jxr_linenumber" name="303" href="#303">303</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
-<a class="jxr_linenumber" name="304" href="#304">304</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> p_assignmentManager)
+<a class="jxr_linenumber" name="303" href="#303">303</a> <strong class="jxr_keyword">protected</strong> String format;
+<a class="jxr_linenumber" name="304" href="#304">304</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)
<a class="jxr_linenumber" name="305" href="#305">305</a> {
-<a class="jxr_linenumber" name="306" href="#306">306</a> (getImplData()).setAssignmentManager(p_assignmentManager);
+<a class="jxr_linenumber" name="306" href="#306">306</a> (getImplData()).setFormat(p_format);
<a class="jxr_linenumber" name="307" href="#307">307</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="308" href="#308">308</a> }
<a class="jxr_linenumber" name="309" href="#309">309</a>
-<a class="jxr_linenumber" name="310" href="#310">310</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
-<a class="jxr_linenumber" name="311" href="#311">311</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> p_serverManager)
+<a class="jxr_linenumber" name="310" href="#310">310</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled;
+<a class="jxr_linenumber" name="311" href="#311">311</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(<strong class="jxr_keyword">boolean</strong> p_catalogJanitorEnabled)
<a class="jxr_linenumber" name="312" href="#312">312</a> {
-<a class="jxr_linenumber" name="313" href="#313">313</a> (getImplData()).setServerManager(p_serverManager);
+<a class="jxr_linenumber" name="313" href="#313">313</a> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);
<a class="jxr_linenumber" name="314" href="#314">314</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="315" href="#315">315</a> }
<a class="jxr_linenumber" name="316" href="#316">316</a>
-<a class="jxr_linenumber" name="317" href="#317">317</a> <strong class="jxr_keyword">protected</strong> Set<ServerName> deadServers;
-<a class="jxr_linenumber" name="318" href="#318">318</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)
+<a class="jxr_linenumber" name="317" href="#317">317</a> <strong class="jxr_keyword">protected</strong> String filter;
+<a class="jxr_linenumber" name="318" href="#318">318</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)
<a class="jxr_linenumber" name="319" href="#319">319</a> {
-<a class="jxr_linenumber" name="320" href="#320">320</a> (getImplData()).setDeadServers(p_deadServers);
+<a class="jxr_linenumber" name="320" href="#320">320</a> (getImplData()).setFilter(p_filter);
<a class="jxr_linenumber" name="321" href="#321">321</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="322" href="#322">322</a> }
<a class="jxr_linenumber" name="323" href="#323">323</a>
-<a class="jxr_linenumber" name="324" href="#324">324</a> <strong class="jxr_keyword">protected</strong> List<ServerName> servers;
-<a class="jxr_linenumber" name="325" href="#325">325</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)
+<a class="jxr_linenumber" name="324" href="#324">324</a> <strong class="jxr_keyword">protected</strong> Set<ServerName> deadServers;
+<a class="jxr_linenumber" name="325" href="#325">325</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)
<a class="jxr_linenumber" name="326" href="#326">326</a> {
-<a class="jxr_linenumber" name="327" href="#327">327</a> (getImplData()).setServers(p_servers);
+<a class="jxr_linenumber" name="327" href="#327">327</a> (getImplData()).setDeadServers(p_deadServers);
<a class="jxr_linenumber" name="328" href="#328">328</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="329" href="#329">329</a> }
<a class="jxr_linenumber" name="330" href="#330">330</a>
-<a class="jxr_linenumber" name="331" href="#331">331</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
-<a class="jxr_linenumber" name="332" href="#332">332</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> p_metaLocation)
+<a class="jxr_linenumber" name="331" href="#331">331</a> <strong class="jxr_keyword">protected</strong> List<ServerName> servers;
+<a class="jxr_linenumber" name="332" href="#332">332</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)
<a class="jxr_linenumber" name="333" href="#333">333</a> {
-<a class="jxr_linenumber" name="334" href="#334">334</a> (getImplData()).setMetaLocation(p_metaLocation);
+<a class="jxr_linenumber" name="334" href="#334">334</a> (getImplData()).setServers(p_servers);
<a class="jxr_linenumber" name="335" href="#335">335</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="336" href="#336">336</a> }
<a class="jxr_linenumber" name="337" href="#337">337</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
index 43584c7..bbbdd3e 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
@@ -70,15 +70,15 @@
<a class="jxr_linenumber" name="60" href="#60">60</a>
<a class="jxr_linenumber" name="61" href="#61">61</a> {
<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html">HMaster</a> master;
-<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
-<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled;
+<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
+<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map<String,Integer> frags;
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
-<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
-<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
-<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Set<ServerName> deadServers;
-<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List<ServerName> servers;
-<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
+<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
+<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
+<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled;
+<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
+<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Set<ServerName> deadServers;
+<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List<ServerName> servers;
<a class="jxr_linenumber" name="72" href="#72">72</a> <em class="jxr_comment">// 68, 1</em>
<a class="jxr_linenumber" name="73" href="#73">73</a>
<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">public</strong> String formatZKString() {
@@ -108,41 +108,41 @@
<a class="jxr_linenumber" name="98" href="#98">98</a>
<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData p_implData)
<a class="jxr_linenumber" name="100" href="#100">100</a> {
-<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
+<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">if</strong>(! p_implData.getMetaLocation__IsNotDefault())
<a class="jxr_linenumber" name="102" href="#102">102</a> {
-<a class="jxr_linenumber" name="103" href="#103">103</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
+<a class="jxr_linenumber" name="103" href="#103">103</a> p_implData.setMetaLocation(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="104" href="#104">104</a> }
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">if</strong>(! p_implData.getCatalogJanitorEnabled__IsNotDefault())
+<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">if</strong>(! p_implData.getServerManager__IsNotDefault())
<a class="jxr_linenumber" name="106" href="#106">106</a> {
-<a class="jxr_linenumber" name="107" href="#107">107</a> p_implData.setCatalogJanitorEnabled(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="107" href="#107">107</a> p_implData.setServerManager(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="108" href="#108">108</a> }
<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFrags__IsNotDefault())
<a class="jxr_linenumber" name="110" href="#110">110</a> {
<a class="jxr_linenumber" name="111" href="#111">111</a> p_implData.setFrags(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="112" href="#112">112</a> }
-<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
+<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">if</strong>(! p_implData.getAssignmentManager__IsNotDefault())
<a class="jxr_linenumber" name="114" href="#114">114</a> {
-<a class="jxr_linenumber" name="115" href="#115">115</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
+<a class="jxr_linenumber" name="115" href="#115">115</a> p_implData.setAssignmentManager(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="116" href="#116">116</a> }
-<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">if</strong>(! p_implData.getAssignmentManager__IsNotDefault())
+<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
<a class="jxr_linenumber" name="118" href="#118">118</a> {
-<a class="jxr_linenumber" name="119" href="#119">119</a> p_implData.setAssignmentManager(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="119" href="#119">119</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
<a class="jxr_linenumber" name="120" href="#120">120</a> }
-<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">if</strong>(! p_implData.getServerManager__IsNotDefault())
+<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">if</strong>(! p_implData.getCatalogJanitorEnabled__IsNotDefault())
<a class="jxr_linenumber" name="122" href="#122">122</a> {
-<a class="jxr_linenumber" name="123" href="#123">123</a> p_implData.setServerManager(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="123" href="#123">123</a> p_implData.setCatalogJanitorEnabled(<strong class="jxr_keyword">true</strong>);
<a class="jxr_linenumber" name="124" href="#124">124</a> }
-<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">if</strong>(! p_implData.getDeadServers__IsNotDefault())
+<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
<a class="jxr_linenumber" name="126" href="#126">126</a> {
-<a class="jxr_linenumber" name="127" href="#127">127</a> p_implData.setDeadServers(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="127" href="#127">127</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
<a class="jxr_linenumber" name="128" href="#128">128</a> }
-<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">if</strong>(! p_implData.getServers__IsNotDefault())
+<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">if</strong>(! p_implData.getDeadServers__IsNotDefault())
<a class="jxr_linenumber" name="130" href="#130">130</a> {
-<a class="jxr_linenumber" name="131" href="#131">131</a> p_implData.setServers(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="131" href="#131">131</a> p_implData.setDeadServers(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="132" href="#132">132</a> }
-<a class="jxr_linenumber" name="133" href="#133">133</a> <strong class="jxr_keyword">if</strong>(! p_implData.getMetaLocation__IsNotDefault())
+<a class="jxr_linenumber" name="133" href="#133">133</a> <strong class="jxr_keyword">if</strong>(! p_implData.getServers__IsNotDefault())
<a class="jxr_linenumber" name="134" href="#134">134</a> {
-<a class="jxr_linenumber" name="135" href="#135">135</a> p_implData.setMetaLocation(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="135" href="#135">135</a> p_implData.setServers(<strong class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="136" href="#136">136</a> }
<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">return</strong> p_implData;
<a class="jxr_linenumber" name="138" href="#138">138</a> }
@@ -150,15 +150,15 @@
<a class="jxr_linenumber" name="140" href="#140">140</a> {
<a class="jxr_linenumber" name="141" href="#141">141</a> <strong class="jxr_keyword">super</strong>(p_templateManager, __jamon_setOptionalArguments(p_implData));
<a class="jxr_linenumber" name="142" href="#142">142</a> master = p_implData.getMaster();
-<a class="jxr_linenumber" name="143" href="#143">143</a> format = p_implData.getFormat();
-<a class="jxr_linenumber" name="144" href="#144">144</a> catalogJanitorEnabled = p_implData.getCatalogJanitorEnabled();
+<a class="jxr_linenumber" name="143" href="#143">143</a> metaLocation = p_implData.getMetaLocation();
+<a class="jxr_linenumber" name="144" href="#144">144</a> serverManager = p_implData.getServerManager();
<a class="jxr_linenumber" name="145" href="#145">145</a> frags = p_implData.getFrags();
-<a class="jxr_linenumber" name="146" href="#146">146</a> filter = p_implData.getFilter();
-<a class="jxr_linenumber" name="147" href="#147">147</a> assignmentManager = p_implData.getAssignmentManager();
-<a class="jxr_linenumber" name="148" href="#148">148</a> serverManager = p_implData.getServerManager();
-<a class="jxr_linenumber" name="149" href="#149">149</a> deadServers = p_implData.getDeadServers();
-<a class="jxr_linenumber" name="150" href="#150">150</a> servers = p_implData.getServers();
-<a class="jxr_linenumber" name="151" href="#151">151</a> metaLocation = p_implData.getMetaLocation();
+<a class="jxr_linenumber" name="146" href="#146">146</a> assignmentManager = p_implData.getAssignmentManager();
+<a class="jxr_linenumber" name="147" href="#147">147</a> format = p_implData.getFormat();
+<a class="jxr_linenumber" name="148" href="#148">148</a> catalogJanitorEnabled = p_implData.getCatalogJanitorEnabled();
+<a class="jxr_linenumber" name="149" href="#149">149</a> filter = p_implData.getFilter();
+<a class="jxr_linenumber" name="150" href="#150">150</a> deadServers = p_implData.getDeadServers();
+<a class="jxr_linenumber" name="151" href="#151">151</a> servers = p_implData.getServers();
<a class="jxr_linenumber" name="152" href="#152">152</a> }
<a class="jxr_linenumber" name="153" href="#153">153</a>
<a class="jxr_linenumber" name="154" href="#154">154</a> @Override <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
@@ -172,8 +172,8 @@
<a class="jxr_linenumber" name="162" href="#162">162</a> <em class="jxr_comment">// 60, 3</em>
<a class="jxr_linenumber" name="163" href="#163">163</a> {
<a class="jxr_linenumber" name="164" href="#164">164</a> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl __jamon__<strong class="jxr_keyword">var</strong>_6 = <strong class="jxr_keyword">new</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl(<strong class="jxr_keyword">this</strong>.getTemplateManager());
-<a class="jxr_linenumber" name="165" href="#165">165</a> __jamon__<strong class="jxr_keyword">var</strong>_6.setFormat(<span class="jxr_string">"json"</span> );
-<a class="jxr_linenumber" name="166" href="#166">166</a> __jamon__<strong class="jxr_keyword">var</strong>_6.setFilter(filter);
+<a class="jxr_linenumber" name="165" href="#165">165</a> __jamon__<strong class="jxr_keyword">var</strong>_6.setFilter(filter);
+<a class="jxr_linenumber" name="166" href="#166">166</a> __jamon__<strong class="jxr_keyword">var</strong>_6.setFormat(<span class="jxr_string">"json"</span> );
<a class="jxr_linenumber" name="167" href="#167">167</a> __jamon__<strong class="jxr_keyword">var</strong>_6.renderNoFlush(jamonWriter);
<a class="jxr_linenumber" name="168" href="#168">168</a> }
<a class="jxr_linenumber" name="169" href="#169">169</a> <em class="jxr_comment">// 60, 68</em>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
index 0a7ba70..ab8d418 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
@@ -35,10 +35,10 @@
<a class="jxr_linenumber" name="25" href="#25">25</a> requiredArguments = {
<a class="jxr_linenumber" name="26" href="#26">26</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"regionServer"</span>, type = <span class="jxr_string">"HRegionServer"</span>)},
<a class="jxr_linenumber" name="27" href="#27">27</a> optionalArguments = {
-<a class="jxr_linenumber" name="28" href="#28">28</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="29" href="#29">29</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="30" href="#30">30</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"bcv"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="31" href="#31">31</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"bcn"</span>, type = <span class="jxr_string">"String"</span>)})
+<a class="jxr_linenumber" name="28" href="#28">28</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="29" href="#29">29</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"bcv"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="30" href="#30">30</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"bcn"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="31" href="#31">31</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>)})
<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html">RSStatusTmpl</a>
<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy
<a class="jxr_linenumber" name="34" href="#34">34</a> {
@@ -79,74 +79,74 @@
<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">return</strong> m_regionServer;
<a class="jxr_linenumber" name="70" href="#70">70</a> }
<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html">HRegionServer</a> m_regionServer;
-<a class="jxr_linenumber" name="72" href="#72">72</a> <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
+<a class="jxr_linenumber" name="72" href="#72">72</a> <em class="jxr_comment">// 21, 1</em>
+<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
<a class="jxr_linenumber" name="74" href="#74">74</a> {
-<a class="jxr_linenumber" name="75" href="#75">75</a> <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="76" href="#76">76</a> m_format = format;
-<a class="jxr_linenumber" name="77" href="#77">77</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="75" href="#75">75</a> <em class="jxr_comment">// 21, 1</em>
+<a class="jxr_linenumber" name="76" href="#76">76</a> m_filter = filter;
+<a class="jxr_linenumber" name="77" href="#77">77</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="78" href="#78">78</a> }
-<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">public</strong> String getFormat()
+<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">public</strong> String getFilter()
<a class="jxr_linenumber" name="80" href="#80">80</a> {
-<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">return</strong> m_format;
+<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">return</strong> m_filter;
<a class="jxr_linenumber" name="82" href="#82">82</a> }
-<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">private</strong> String m_format;
-<a class="jxr_linenumber" name="84" href="#84">84</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">private</strong> String m_filter;
+<a class="jxr_linenumber" name="84" href="#84">84</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
<a class="jxr_linenumber" name="85" href="#85">85</a> {
-<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
<a class="jxr_linenumber" name="87" href="#87">87</a> }
-<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
-<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// 21, 1</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
+<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="90" href="#90">90</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setBcv(String bcv)
<a class="jxr_linenumber" name="91" href="#91">91</a> {
-<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_comment">// 21, 1</em>
-<a class="jxr_linenumber" name="93" href="#93">93</a> m_filter = filter;
-<a class="jxr_linenumber" name="94" href="#94">94</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="93" href="#93">93</a> m_bcv = bcv;
+<a class="jxr_linenumber" name="94" href="#94">94</a> m_bcv__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="95" href="#95">95</a> }
-<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">public</strong> String getFilter()
+<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">public</strong> String getBcv()
<a class="jxr_linenumber" name="97" href="#97">97</a> {
-<a class="jxr_linenumber" name="98" href="#98">98</a> <strong class="jxr_keyword">return</strong> m_filter;
+<a class="jxr_linenumber" name="98" href="#98">98</a> <strong class="jxr_keyword">return</strong> m_bcv;
<a class="jxr_linenumber" name="99" href="#99">99</a> }
-<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">private</strong> String m_filter;
-<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
+<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">private</strong> String m_bcv;
+<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getBcv__IsNotDefault()
<a class="jxr_linenumber" name="102" href="#102">102</a> {
-<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">return</strong> m_bcv__IsNotDefault;
<a class="jxr_linenumber" name="104" href="#104">104</a> }
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
-<a class="jxr_linenumber" name="106" href="#106">106</a> <em class="jxr_comment">// 24, 1</em>
-<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setBcv(String bcv)
+<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_bcv__IsNotDefault;
+<a class="jxr_linenumber" name="106" href="#106">106</a> <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setBcn(String bcn)
<a class="jxr_linenumber" name="108" href="#108">108</a> {
-<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_comment">// 24, 1</em>
-<a class="jxr_linenumber" name="110" href="#110">110</a> m_bcv = bcv;
-<a class="jxr_linenumber" name="111" href="#111">111</a> m_bcv__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="110" href="#110">110</a> m_bcn = bcn;
+<a class="jxr_linenumber" name="111" href="#111">111</a> m_bcn__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="112" href="#112">112</a> }
-<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">public</strong> String getBcv()
+<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">public</strong> String getBcn()
<a class="jxr_linenumber" name="114" href="#114">114</a> {
-<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">return</strong> m_bcv;
+<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">return</strong> m_bcn;
<a class="jxr_linenumber" name="116" href="#116">116</a> }
-<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">private</strong> String m_bcv;
-<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getBcv__IsNotDefault()
+<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">private</strong> String m_bcn;
+<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getBcn__IsNotDefault()
<a class="jxr_linenumber" name="119" href="#119">119</a> {
-<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">return</strong> m_bcv__IsNotDefault;
+<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">return</strong> m_bcn__IsNotDefault;
<a class="jxr_linenumber" name="121" href="#121">121</a> }
-<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_bcv__IsNotDefault;
-<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment">// 23, 1</em>
-<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setBcn(String bcn)
+<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_bcn__IsNotDefault;
+<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
<a class="jxr_linenumber" name="125" href="#125">125</a> {
-<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_comment">// 23, 1</em>
-<a class="jxr_linenumber" name="127" href="#127">127</a> m_bcn = bcn;
-<a class="jxr_linenumber" name="128" href="#128">128</a> m_bcn__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="127" href="#127">127</a> m_format = format;
+<a class="jxr_linenumber" name="128" href="#128">128</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="129" href="#129">129</a> }
-<a class="jxr_linenumber" name="130" href="#130">130</a> <strong class="jxr_keyword">public</strong> String getBcn()
+<a class="jxr_linenumber" name="130" href="#130">130</a> <strong class="jxr_keyword">public</strong> String getFormat()
<a class="jxr_linenumber" name="131" href="#131">131</a> {
-<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">return</strong> m_bcn;
+<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">return</strong> m_format;
<a class="jxr_linenumber" name="133" href="#133">133</a> }
-<a class="jxr_linenumber" name="134" href="#134">134</a> <strong class="jxr_keyword">private</strong> String m_bcn;
-<a class="jxr_linenumber" name="135" href="#135">135</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getBcn__IsNotDefault()
+<a class="jxr_linenumber" name="134" href="#134">134</a> <strong class="jxr_keyword">private</strong> String m_format;
+<a class="jxr_linenumber" name="135" href="#135">135</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
<a class="jxr_linenumber" name="136" href="#136">136</a> {
-<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">return</strong> m_bcn__IsNotDefault;
+<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
<a class="jxr_linenumber" name="138" href="#138">138</a> }
-<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_bcn__IsNotDefault;
+<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
<a class="jxr_linenumber" name="140" href="#140">140</a> }
<a class="jxr_linenumber" name="141" href="#141">141</a> @Override
<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateProxy.ImplData makeImplData()
@@ -158,31 +158,31 @@
<a class="jxr_linenumber" name="148" href="#148">148</a> <strong class="jxr_keyword">return</strong> (ImplData) <strong class="jxr_keyword">super</strong>.getImplData();
<a class="jxr_linenumber" name="149" href="#149">149</a> }
<a class="jxr_linenumber" name="150" href="#150">150</a>
-<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">protected</strong> String format;
-<a class="jxr_linenumber" name="152" href="#152">152</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)
+<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">protected</strong> String filter;
+<a class="jxr_linenumber" name="152" href="#152">152</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)
<a class="jxr_linenumber" name="153" href="#153">153</a> {
-<a class="jxr_linenumber" name="154" href="#154">154</a> (getImplData()).setFormat(p_format);
+<a class="jxr_linenumber" name="154" href="#154">154</a> (getImplData()).setFilter(p_filter);
<a class="jxr_linenumber" name="155" href="#155">155</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="156" href="#156">156</a> }
<a class="jxr_linenumber" name="157" href="#157">157</a>
-<a class="jxr_linenumber" name="158" href="#158">158</a> <strong class="jxr_keyword">protected</strong> String filter;
-<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)
+<a class="jxr_linenumber" name="158" href="#158">158</a> <strong class="jxr_keyword">protected</strong> String bcv;
+<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)
<a class="jxr_linenumber" name="160" href="#160">160</a> {
-<a class="jxr_linenumber" name="161" href="#161">161</a> (getImplData()).setFilter(p_filter);
+<a class="jxr_linenumber" name="161" href="#161">161</a> (getImplData()).setBcv(p_bcv);
<a class="jxr_linenumber" name="162" href="#162">162</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="163" href="#163">163</a> }
<a class="jxr_linenumber" name="164" href="#164">164</a>
-<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">protected</strong> String bcv;
-<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)
+<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">protected</strong> String bcn;
+<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)
<a class="jxr_linenumber" name="167" href="#167">167</a> {
-<a class="jxr_linenumber" name="168" href="#168">168</a> (getImplData()).setBcv(p_bcv);
+<a class="jxr_linenumber" name="168" href="#168">168</a> (getImplData()).setBcn(p_bcn);
<a class="jxr_linenumber" name="169" href="#169">169</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="170" href="#170">170</a> }
<a class="jxr_linenumber" name="171" href="#171">171</a>
-<a class="jxr_linenumber" name="172" href="#172">172</a> <strong class="jxr_keyword">protected</strong> String bcn;
-<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)
+<a class="jxr_linenumber" name="172" href="#172">172</a> <strong class="jxr_keyword">protected</strong> String format;
+<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)
<a class="jxr_linenumber" name="174" href="#174">174</a> {
-<a class="jxr_linenumber" name="175" href="#175">175</a> (getImplData()).setBcn(p_bcn);
+<a class="jxr_linenumber" name="175" href="#175">175</a> (getImplData()).setFormat(p_format);
<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
<a class="jxr_linenumber" name="177" href="#177">177</a> }
<a class="jxr_linenumber" name="178" href="#178">178</a>
[09/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
index 13e0e7c..1bdbf69 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
@@ -42,518 +42,522 @@
<span class="sourceLineNo">034</span>import org.apache.hadoop.conf.Configuration;<a name="line.34"></a>
<span class="sourceLineNo">035</span>import org.apache.hadoop.fs.FileSystem;<a name="line.35"></a>
<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.Path;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HConstants;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.ServerName;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.TableName;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.UnknownRegionException;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Put;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.client.RegionReplicaUtil;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.Result;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.Table;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.exceptions.MergeRegionException;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.master.AssignmentManager;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.master.MasterRpcServices;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.master.RegionState.State;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.master.RegionStates;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.util.PairOfSameType;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import org.apache.hadoop.util.StringUtils;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import org.apache.zookeeper.KeeperException;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>import org.junit.AfterClass;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>import org.junit.BeforeClass;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>import org.junit.Test;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>import org.junit.experimental.categories.Category;<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>import com.google.common.base.Joiner;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>import com.google.protobuf.RpcController;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>import com.google.protobuf.ServiceException;<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>/**<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * Like {@link TestRegionMergeTransaction} in that we're testing<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * {@link RegionMergeTransactionImpl} only the below tests are against a running<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * cluster where {@link TestRegionMergeTransaction} is tests against bare<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * {@link HRegion}.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> */<a name="line.89"></a>
-<span class="sourceLineNo">090</span>@Category({RegionServerTests.class, LargeTests.class})<a name="line.90"></a>
-<span class="sourceLineNo">091</span>public class TestRegionMergeTransactionOnCluster {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> private static final Log LOG = LogFactory<a name="line.92"></a>
-<span class="sourceLineNo">093</span> .getLog(TestRegionMergeTransactionOnCluster.class);<a name="line.93"></a>
-<span class="sourceLineNo">094</span> private static final int NB_SERVERS = 3;<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span> private static final byte[] FAMILYNAME = Bytes.toBytes("fam");<a name="line.96"></a>
-<span class="sourceLineNo">097</span> private static final byte[] QUALIFIER = Bytes.toBytes("q");<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> private static byte[] ROW = Bytes.toBytes("testRow");<a name="line.99"></a>
-<span class="sourceLineNo">100</span> private static final int INITIAL_REGION_NUM = 10;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> private static final int ROWSIZE = 200;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> private static byte[][] ROWS = makeN(ROW, ROWSIZE);<a name="line.102"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.CategoryBasedTimeout;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HConstants;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.ServerName;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.TableName;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.UnknownRegionException;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.client.Put;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.RegionReplicaUtil;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.Result;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.client.Table;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.exceptions.MergeRegionException;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.master.AssignmentManager;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.master.MasterRpcServices;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.master.RegionState.State;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.master.RegionStates;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import org.apache.hadoop.hbase.util.PairOfSameType;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import org.apache.hadoop.util.StringUtils;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>import org.apache.zookeeper.KeeperException;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>import org.junit.AfterClass;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>import org.junit.BeforeClass;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>import org.junit.Rule;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>import org.junit.Test;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>import org.junit.experimental.categories.Category;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>import org.junit.rules.TestRule;<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>import com.google.common.base.Joiner;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>import com.google.protobuf.RpcController;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>import com.google.protobuf.ServiceException;<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>/**<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * Like {@link TestRegionMergeTransaction} in that we're testing<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * {@link RegionMergeTransactionImpl} only the below tests are against a running<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * cluster where {@link TestRegionMergeTransaction} is tests against bare<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * {@link HRegion}.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> */<a name="line.92"></a>
+<span class="sourceLineNo">093</span>@Category({RegionServerTests.class, LargeTests.class})<a name="line.93"></a>
+<span class="sourceLineNo">094</span>public class TestRegionMergeTransactionOnCluster {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> private static final Log LOG = LogFactory<a name="line.95"></a>
+<span class="sourceLineNo">096</span> .getLog(TestRegionMergeTransactionOnCluster.class);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> @Rule public final TestRule timeout = CategoryBasedTimeout.builder().withTimeout(this.getClass()).<a name="line.97"></a>
+<span class="sourceLineNo">098</span> withLookingForStuckThread(true).build();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> private static final int NB_SERVERS = 3;<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span> private static final byte[] FAMILYNAME = Bytes.toBytes("fam");<a name="line.101"></a>
+<span class="sourceLineNo">102</span> private static final byte[] QUALIFIER = Bytes.toBytes("q");<a name="line.102"></a>
<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> private static int waitTime = 60 * 1000;<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> private static HMaster master;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> private static Admin admin;<a name="line.109"></a>
+<span class="sourceLineNo">104</span> private static byte[] ROW = Bytes.toBytes("testRow");<a name="line.104"></a>
+<span class="sourceLineNo">105</span> private static final int INITIAL_REGION_NUM = 10;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> private static final int ROWSIZE = 200;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> private static byte[][] ROWS = makeN(ROW, ROWSIZE);<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> private static int waitTime = 60 * 1000;<a name="line.109"></a>
<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> @BeforeClass<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public static void beforeAllTests() throws Exception {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> // Start a cluster<a name="line.113"></a>
-<span class="sourceLineNo">114</span> TEST_UTIL.startMiniCluster(1, NB_SERVERS, null, MyMaster.class, null);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> master = cluster.getMaster();<a name="line.116"></a>
-<span class="sourceLineNo">117</span> master.balanceSwitch(false);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> admin = TEST_UTIL.getHBaseAdmin();<a name="line.118"></a>
-<span class="sourceLineNo">119</span> }<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> @AfterClass<a name="line.121"></a>
-<span class="sourceLineNo">122</span> public static void afterAllTests() throws Exception {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> TEST_UTIL.shutdownMiniCluster();<a name="line.123"></a>
+<span class="sourceLineNo">111</span> static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> private static HMaster MASTER;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> private static Admin ADMIN;<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> @BeforeClass<a name="line.116"></a>
+<span class="sourceLineNo">117</span> public static void beforeAllTests() throws Exception {<a name="line.117"></a>
+<span class="sourceLineNo">118</span> // Start a cluster<a name="line.118"></a>
+<span class="sourceLineNo">119</span> TEST_UTIL.startMiniCluster(1, NB_SERVERS, null, MyMaster.class, null);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.120"></a>
+<span class="sourceLineNo">121</span> MASTER = cluster.getMaster();<a name="line.121"></a>
+<span class="sourceLineNo">122</span> MASTER.balanceSwitch(false);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> ADMIN = TEST_UTIL.getConnection().getAdmin();<a name="line.123"></a>
<span class="sourceLineNo">124</span> }<a name="line.124"></a>
<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> @Test<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public void testWholesomeMerge() throws Exception {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> LOG.info("Starting testWholesomeMerge");<a name="line.128"></a>
-<span class="sourceLineNo">129</span> final TableName tableName =<a name="line.129"></a>
-<span class="sourceLineNo">130</span> TableName.valueOf("testWholesomeMerge");<a name="line.130"></a>
+<span class="sourceLineNo">126</span> @AfterClass<a name="line.126"></a>
+<span class="sourceLineNo">127</span> public static void afterAllTests() throws Exception {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> TEST_UTIL.shutdownMiniCluster();<a name="line.128"></a>
+<span class="sourceLineNo">129</span> if (ADMIN != null) ADMIN.close();<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> // Create table and load data.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> Table table = createTableAndLoadData(master, tableName);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> // Merge 1st and 2nd region<a name="line.134"></a>
-<span class="sourceLineNo">135</span> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,<a name="line.135"></a>
-<span class="sourceLineNo">136</span> INITIAL_REGION_NUM - 1);<a name="line.136"></a>
+<span class="sourceLineNo">132</span> @Test<a name="line.132"></a>
+<span class="sourceLineNo">133</span> public void testWholesomeMerge() throws Exception {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> LOG.info("Starting testWholesomeMerge");<a name="line.134"></a>
+<span class="sourceLineNo">135</span> final TableName tableName =<a name="line.135"></a>
+<span class="sourceLineNo">136</span> TableName.valueOf("testWholesomeMerge");<a name="line.136"></a>
<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> // Merge 2nd and 3th region<a name="line.138"></a>
-<span class="sourceLineNo">139</span> PairOfSameType<HRegionInfo> mergedRegions =<a name="line.139"></a>
-<span class="sourceLineNo">140</span> mergeRegionsAndVerifyRegionNum(master, tableName, 1, 2,<a name="line.140"></a>
-<span class="sourceLineNo">141</span> INITIAL_REGION_NUM - 2);<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> verifyRowCount(table, ROWSIZE);<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> // Randomly choose one of the two merged regions<a name="line.145"></a>
-<span class="sourceLineNo">146</span> HRegionInfo hri = RandomUtils.nextBoolean() ?<a name="line.146"></a>
-<span class="sourceLineNo">147</span> mergedRegions.getFirst() : mergedRegions.getSecond();<a name="line.147"></a>
-<span class="sourceLineNo">148</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> AssignmentManager am = cluster.getMaster().getAssignmentManager();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> RegionStates regionStates = am.getRegionStates();<a name="line.150"></a>
-<span class="sourceLineNo">151</span> long start = EnvironmentEdgeManager.currentTime();<a name="line.151"></a>
-<span class="sourceLineNo">152</span> while (!regionStates.isRegionInState(hri, State.MERGED)) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> assertFalse("Timed out in waiting one merged region to be in state MERGED",<a name="line.153"></a>
-<span class="sourceLineNo">154</span> EnvironmentEdgeManager.currentTime() - start > 60000);<a name="line.154"></a>
-<span class="sourceLineNo">155</span> Thread.sleep(500);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> // We should not be able to assign it again<a name="line.158"></a>
-<span class="sourceLineNo">159</span> am.assign(hri, true);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> assertFalse("Merged region can't be assigned",<a name="line.160"></a>
-<span class="sourceLineNo">161</span> regionStates.isRegionInTransition(hri));<a name="line.161"></a>
-<span class="sourceLineNo">162</span> assertTrue(regionStates.isRegionInState(hri, State.MERGED));<a name="line.162"></a>
+<span class="sourceLineNo">138</span> // Create table and load data.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> // Merge 1st and 2nd region<a name="line.140"></a>
+<span class="sourceLineNo">141</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1,<a name="line.141"></a>
+<span class="sourceLineNo">142</span> INITIAL_REGION_NUM - 1);<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> // Merge 2nd and 3th region<a name="line.144"></a>
+<span class="sourceLineNo">145</span> PairOfSameType<HRegionInfo> mergedRegions =<a name="line.145"></a>
+<span class="sourceLineNo">146</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 1, 2,<a name="line.146"></a>
+<span class="sourceLineNo">147</span> INITIAL_REGION_NUM - 2);<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> verifyRowCount(table, ROWSIZE);<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> // Randomly choose one of the two merged regions<a name="line.151"></a>
+<span class="sourceLineNo">152</span> HRegionInfo hri = RandomUtils.nextBoolean() ?<a name="line.152"></a>
+<span class="sourceLineNo">153</span> mergedRegions.getFirst() : mergedRegions.getSecond();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.154"></a>
+<span class="sourceLineNo">155</span> AssignmentManager am = cluster.getMaster().getAssignmentManager();<a name="line.155"></a>
+<span class="sourceLineNo">156</span> RegionStates regionStates = am.getRegionStates();<a name="line.156"></a>
+<span class="sourceLineNo">157</span> long start = EnvironmentEdgeManager.currentTime();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> while (!regionStates.isRegionInState(hri, State.MERGED)) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> assertFalse("Timed out in waiting one merged region to be in state MERGED",<a name="line.159"></a>
+<span class="sourceLineNo">160</span> EnvironmentEdgeManager.currentTime() - start > 60000);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> Thread.sleep(500);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> // We should not be able to unassign it either<a name="line.164"></a>
-<span class="sourceLineNo">165</span> am.unassign(hri, null);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> assertFalse("Merged region can't be unassigned",<a name="line.166"></a>
+<span class="sourceLineNo">164</span> // We should not be able to assign it again<a name="line.164"></a>
+<span class="sourceLineNo">165</span> am.assign(hri, true);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> assertFalse("Merged region can't be assigned",<a name="line.166"></a>
<span class="sourceLineNo">167</span> regionStates.isRegionInTransition(hri));<a name="line.167"></a>
<span class="sourceLineNo">168</span> assertTrue(regionStates.isRegionInState(hri, State.MERGED));<a name="line.168"></a>
<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> table.close();<a name="line.170"></a>
-<span class="sourceLineNo">171</span> }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> /**<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * Not really restarting the master. Simulate it by clear of new region<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * state since it is not persisted, will be lost after master restarts.<a name="line.175"></a>
-<span class="sourceLineNo">176</span> */<a name="line.176"></a>
-<span class="sourceLineNo">177</span> @Test<a name="line.177"></a>
-<span class="sourceLineNo">178</span> public void testMergeAndRestartingMaster() throws Exception {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> LOG.info("Starting testMergeAndRestartingMaster");<a name="line.179"></a>
-<span class="sourceLineNo">180</span> final TableName tableName = TableName.valueOf("testMergeAndRestartingMaster");<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> // Create table and load data.<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Table table = createTableAndLoadData(master, tableName);<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> try {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> MyMasterRpcServices.enabled.set(true);<a name="line.186"></a>
+<span class="sourceLineNo">170</span> // We should not be able to unassign it either<a name="line.170"></a>
+<span class="sourceLineNo">171</span> am.unassign(hri, null);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> assertFalse("Merged region can't be unassigned",<a name="line.172"></a>
+<span class="sourceLineNo">173</span> regionStates.isRegionInTransition(hri));<a name="line.173"></a>
+<span class="sourceLineNo">174</span> assertTrue(regionStates.isRegionInState(hri, State.MERGED));<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> table.close();<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span> /**<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * Not really restarting the master. Simulate it by clear of new region<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * state since it is not persisted, will be lost after master restarts.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> */<a name="line.182"></a>
+<span class="sourceLineNo">183</span> @Test<a name="line.183"></a>
+<span class="sourceLineNo">184</span> public void testMergeAndRestartingMaster() throws Exception {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.info("Starting testMergeAndRestartingMaster");<a name="line.185"></a>
+<span class="sourceLineNo">186</span> final TableName tableName = TableName.valueOf("testMergeAndRestartingMaster");<a name="line.186"></a>
<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> // Merge 1st and 2nd region<a name="line.188"></a>
-<span class="sourceLineNo">189</span> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,<a name="line.189"></a>
-<span class="sourceLineNo">190</span> INITIAL_REGION_NUM - 1);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> } finally {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> MyMasterRpcServices.enabled.set(false);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> table.close();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> @SuppressWarnings("deprecation")<a name="line.198"></a>
-<span class="sourceLineNo">199</span> @Test<a name="line.199"></a>
-<span class="sourceLineNo">200</span> public void testCleanMergeReference() throws Exception {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> LOG.info("Starting testCleanMergeReference");<a name="line.201"></a>
-<span class="sourceLineNo">202</span> admin.enableCatalogJanitor(false);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> try {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> final TableName tableName =<a name="line.204"></a>
-<span class="sourceLineNo">205</span> TableName.valueOf("testCleanMergeReference");<a name="line.205"></a>
-<span class="sourceLineNo">206</span> // Create table and load data.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> Table table = createTableAndLoadData(master, tableName);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> // Merge 1st and 2nd region<a name="line.208"></a>
-<span class="sourceLineNo">209</span> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,<a name="line.209"></a>
-<span class="sourceLineNo">210</span> INITIAL_REGION_NUM - 1);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> verifyRowCount(table, ROWSIZE);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> table.close();<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor<a name="line.214"></a>
-<span class="sourceLineNo">215</span> .getTableRegionsAndLocations(master.getConnection(), tableName);<a name="line.215"></a>
-<span class="sourceLineNo">216</span> HRegionInfo mergedRegionInfo = tableRegions.get(0).getFirst();<a name="line.216"></a>
-<span class="sourceLineNo">217</span> HTableDescriptor tableDescriptor = master.getTableDescriptors().get(<a name="line.217"></a>
-<span class="sourceLineNo">218</span> tableName);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> Result mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.219"></a>
-<span class="sourceLineNo">220</span> master.getConnection(), mergedRegionInfo.getRegionName());<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> // contains merge reference in META<a name="line.222"></a>
-<span class="sourceLineNo">223</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.223"></a>
-<span class="sourceLineNo">224</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.224"></a>
-<span class="sourceLineNo">225</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.225"></a>
-<span class="sourceLineNo">226</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span> // merging regions' directory are in the file system all the same<a name="line.228"></a>
-<span class="sourceLineNo">229</span> PairOfSameType<HRegionInfo> p = MetaTableAccessor.getMergeRegions(mergedRegionResult);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> HRegionInfo regionA = p.getFirst();<a name="line.230"></a>
-<span class="sourceLineNo">231</span> HRegionInfo regionB = p.getSecond();<a name="line.231"></a>
-<span class="sourceLineNo">232</span> FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.232"></a>
-<span class="sourceLineNo">233</span> Path rootDir = master.getMasterFileSystem().getRootDir();<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span> Path tabledir = FSUtils.getTableDir(rootDir, mergedRegionInfo.getTable());<a name="line.235"></a>
-<span class="sourceLineNo">236</span> Path regionAdir = new Path(tabledir, regionA.getEncodedName());<a name="line.236"></a>
-<span class="sourceLineNo">237</span> Path regionBdir = new Path(tabledir, regionB.getEncodedName());<a name="line.237"></a>
-<span class="sourceLineNo">238</span> assertTrue(fs.exists(regionAdir));<a name="line.238"></a>
-<span class="sourceLineNo">239</span> assertTrue(fs.exists(regionBdir));<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> HColumnDescriptor[] columnFamilies = tableDescriptor.getColumnFamilies();<a name="line.241"></a>
-<span class="sourceLineNo">242</span> HRegionFileSystem hrfs = new HRegionFileSystem(<a name="line.242"></a>
-<span class="sourceLineNo">243</span> TEST_UTIL.getConfiguration(), fs, tabledir, mergedRegionInfo);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> int count = 0;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> count += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> admin.compactRegion(mergedRegionInfo.getRegionName());<a name="line.248"></a>
-<span class="sourceLineNo">249</span> // clean up the merged region store files<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // wait until merged region have reference file<a name="line.250"></a>
-<span class="sourceLineNo">251</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> int newcount = 0;<a name="line.252"></a>
-<span class="sourceLineNo">253</span> while (System.currentTimeMillis() < timeout) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> newcount += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> if(newcount > count) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> break;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span> Thread.sleep(50);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span> assertTrue(newcount > count);<a name="line.262"></a>
-<span class="sourceLineNo">263</span> List<RegionServerThread> regionServerThreads = TEST_UTIL.getHBaseCluster()<a name="line.263"></a>
-<span class="sourceLineNo">264</span> .getRegionServerThreads();<a name="line.264"></a>
-<span class="sourceLineNo">265</span> for (RegionServerThread rs : regionServerThreads) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> CompactedHFilesDischarger cleaner = new CompactedHFilesDischarger(100, null,<a name="line.266"></a>
-<span class="sourceLineNo">267</span> rs.getRegionServer(), false);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> cleaner.chore();<a name="line.268"></a>
-<span class="sourceLineNo">269</span> Thread.sleep(1000);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> while (System.currentTimeMillis() < timeout) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> int newcount1 = 0;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> newcount1 += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> if(newcount1 <= 1) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> break;<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> Thread.sleep(50);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span> // run CatalogJanitor to clean merge references in hbase:meta and archive the<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // files of merging regions<a name="line.282"></a>
-<span class="sourceLineNo">283</span> int cleaned = 0;<a name="line.283"></a>
-<span class="sourceLineNo">284</span> while (cleaned == 0) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> cleaned = admin.runCatalogScan();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> LOG.debug("catalog janitor returned " + cleaned);<a name="line.286"></a>
-<span class="sourceLineNo">287</span> Thread.sleep(50);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> assertFalse(regionAdir.toString(), fs.exists(regionAdir));<a name="line.289"></a>
-<span class="sourceLineNo">290</span> assertFalse(regionBdir.toString(), fs.exists(regionBdir));<a name="line.290"></a>
-<span class="sourceLineNo">291</span> assertTrue(cleaned > 0);<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.293"></a>
-<span class="sourceLineNo">294</span> master.getConnection(), mergedRegionInfo.getRegionName());<a name="line.294"></a>
-<span class="sourceLineNo">295</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.295"></a>
-<span class="sourceLineNo">296</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.297"></a>
-<span class="sourceLineNo">298</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> } finally {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> admin.enableCatalogJanitor(true);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<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> * This test tests 1, merging region not online;<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * 2, merging same two regions; 3, merging unknown regions.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * They are in one test case so that we don't have to create<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * many tables, and these tests are simple.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> */<a name="line.310"></a>
-<span class="sourceLineNo">311</span> @Test<a name="line.311"></a>
-<span class="sourceLineNo">312</span> public void testMerge() throws Exception {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> LOG.info("Starting testMerge");<a name="line.313"></a>
-<span class="sourceLineNo">314</span> final TableName tableName = TableName.valueOf("testMerge");<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> try {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> // Create table and load data.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> Table table = createTableAndLoadData(master, tableName);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> RegionStates regionStates = master.getAssignmentManager().getRegionStates();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> List<HRegionInfo> regions = regionStates.getRegionsOfTable(tableName);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> // Fake offline one region<a name="line.321"></a>
-<span class="sourceLineNo">322</span> HRegionInfo a = regions.get(0);<a name="line.322"></a>
-<span class="sourceLineNo">323</span> HRegionInfo b = regions.get(1);<a name="line.323"></a>
-<span class="sourceLineNo">324</span> regionStates.regionOffline(a);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> try {<a name="line.325"></a>
-<span class="sourceLineNo">326</span> // Merge offline region. Region a is offline here<a name="line.326"></a>
-<span class="sourceLineNo">327</span> admin.mergeRegions(a.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), false);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> fail("Offline regions should not be able to merge");<a name="line.328"></a>
-<span class="sourceLineNo">329</span> } catch (IOException ie) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> System.out.println(ie);<a name="line.330"></a>
-<span class="sourceLineNo">331</span> assertTrue("Exception should mention regions not online",<a name="line.331"></a>
-<span class="sourceLineNo">332</span> StringUtils.stringifyException(ie).contains("regions not online")<a name="line.332"></a>
-<span class="sourceLineNo">333</span> && ie instanceof MergeRegionException);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> try {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> // Merge the same region: b and b.<a name="line.336"></a>
-<span class="sourceLineNo">337</span> admin.mergeRegions(b.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), true);<a name="line.337"></a>
-<span class="sourceLineNo">338</span> fail("A region should not be able to merge with itself, even forcifully");<a name="line.338"></a>
-<span class="sourceLineNo">339</span> } catch (IOException ie) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> assertTrue("Exception should mention regions not online",<a name="line.340"></a>
-<span class="sourceLineNo">341</span> StringUtils.stringifyException(ie).contains("region to itself")<a name="line.341"></a>
-<span class="sourceLineNo">342</span> && ie instanceof MergeRegionException);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span> try {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> // Merge unknown regions<a name="line.345"></a>
-<span class="sourceLineNo">346</span> admin.mergeRegions(Bytes.toBytes("-f1"), Bytes.toBytes("-f2"), true);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> fail("Unknown region could not be merged");<a name="line.347"></a>
-<span class="sourceLineNo">348</span> } catch (IOException ie) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> assertTrue("UnknownRegionException should be thrown",<a name="line.349"></a>
-<span class="sourceLineNo">350</span> ie instanceof UnknownRegionException);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span> table.close();<a name="line.352"></a>
-<span class="sourceLineNo">353</span> } finally {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> TEST_UTIL.deleteTable(tableName);<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span> @Test<a name="line.358"></a>
-<span class="sourceLineNo">359</span> public void testMergeWithReplicas() throws Exception {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> final TableName tableName = TableName.valueOf("testMergeWithReplicas");<a name="line.360"></a>
-<span class="sourceLineNo">361</span> // Create table and load data.<a name="line.361"></a>
-<span class="sourceLineNo">362</span> createTableAndLoadData(master, tableName, 5, 2);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> List<Pair<HRegionInfo, ServerName>> initialRegionToServers =<a name="line.363"></a>
-<span class="sourceLineNo">364</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.364"></a>
-<span class="sourceLineNo">365</span> master.getConnection(), tableName);<a name="line.365"></a>
-<span class="sourceLineNo">366</span> // Merge 1st and 2nd region<a name="line.366"></a>
-<span class="sourceLineNo">367</span> PairOfSameType<HRegionInfo> mergedRegions = mergeRegionsAndVerifyRegionNum(master, tableName,<a name="line.367"></a>
-<span class="sourceLineNo">368</span> 0, 2, 5 * 2 - 2);<a name="line.368"></a>
-<span class="sourceLineNo">369</span> List<Pair<HRegionInfo, ServerName>> currentRegionToServers =<a name="line.369"></a>
-<span class="sourceLineNo">370</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.370"></a>
-<span class="sourceLineNo">371</span> master.getConnection(), tableName);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> List<HRegionInfo> initialRegions = new ArrayList<HRegionInfo>();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> for (Pair<HRegionInfo, ServerName> p : initialRegionToServers) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> initialRegions.add(p.getFirst());<a name="line.374"></a>
-<span class="sourceLineNo">375</span> }<a name="line.375"></a>
-<span class="sourceLineNo">376</span> List<HRegionInfo> currentRegions = new ArrayList<HRegionInfo>();<a name="line.376"></a>
-<span class="sourceLineNo">377</span> for (Pair<HRegionInfo, ServerName> p : currentRegionToServers) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> currentRegions.add(p.getFirst());<a name="line.378"></a>
+<span class="sourceLineNo">188</span> // Create table and load data.<a name="line.188"></a>
+<span class="sourceLineNo">189</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span> try {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> MyMasterRpcServices.enabled.set(true);<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span> // Merge 1st and 2nd region<a name="line.194"></a>
+<span class="sourceLineNo">195</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1, INITIAL_REGION_NUM - 1);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> } finally {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> MyMasterRpcServices.enabled.set(false);<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> table.close();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> @Test<a name="line.203"></a>
+<span class="sourceLineNo">204</span> public void testCleanMergeReference() throws Exception {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> LOG.info("Starting testCleanMergeReference");<a name="line.205"></a>
+<span class="sourceLineNo">206</span> ADMIN.enableCatalogJanitor(false);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> try {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> final TableName tableName =<a name="line.208"></a>
+<span class="sourceLineNo">209</span> TableName.valueOf("testCleanMergeReference");<a name="line.209"></a>
+<span class="sourceLineNo">210</span> // Create table and load data.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> // Merge 1st and 2nd region<a name="line.212"></a>
+<span class="sourceLineNo">213</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1,<a name="line.213"></a>
+<span class="sourceLineNo">214</span> INITIAL_REGION_NUM - 1);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> verifyRowCount(table, ROWSIZE);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> table.close();<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor<a name="line.218"></a>
+<span class="sourceLineNo">219</span> .getTableRegionsAndLocations(MASTER.getConnection(), tableName);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> HRegionInfo mergedRegionInfo = tableRegions.get(0).getFirst();<a name="line.220"></a>
+<span class="sourceLineNo">221</span> HTableDescriptor tableDescriptor = MASTER.getTableDescriptors().get(<a name="line.221"></a>
+<span class="sourceLineNo">222</span> tableName);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> Result mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.223"></a>
+<span class="sourceLineNo">224</span> MASTER.getConnection(), mergedRegionInfo.getRegionName());<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> // contains merge reference in META<a name="line.226"></a>
+<span class="sourceLineNo">227</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.227"></a>
+<span class="sourceLineNo">228</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.229"></a>
+<span class="sourceLineNo">230</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> // merging regions' directory are in the file system all the same<a name="line.232"></a>
+<span class="sourceLineNo">233</span> PairOfSameType<HRegionInfo> p = MetaTableAccessor.getMergeRegions(mergedRegionResult);<a name="line.233"></a>
+<span class="sourceLineNo">234</span> HRegionInfo regionA = p.getFirst();<a name="line.234"></a>
+<span class="sourceLineNo">235</span> HRegionInfo regionB = p.getSecond();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> FileSystem fs = MASTER.getMasterFileSystem().getFileSystem();<a name="line.236"></a>
+<span class="sourceLineNo">237</span> Path rootDir = MASTER.getMasterFileSystem().getRootDir();<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span> Path tabledir = FSUtils.getTableDir(rootDir, mergedRegionInfo.getTable());<a name="line.239"></a>
+<span class="sourceLineNo">240</span> Path regionAdir = new Path(tabledir, regionA.getEncodedName());<a name="line.240"></a>
+<span class="sourceLineNo">241</span> Path regionBdir = new Path(tabledir, regionB.getEncodedName());<a name="line.241"></a>
+<span class="sourceLineNo">242</span> assertTrue(fs.exists(regionAdir));<a name="line.242"></a>
+<span class="sourceLineNo">243</span> assertTrue(fs.exists(regionBdir));<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> HColumnDescriptor[] columnFamilies = tableDescriptor.getColumnFamilies();<a name="line.245"></a>
+<span class="sourceLineNo">246</span> HRegionFileSystem hrfs = new HRegionFileSystem(<a name="line.246"></a>
+<span class="sourceLineNo">247</span> TEST_UTIL.getConfiguration(), fs, tabledir, mergedRegionInfo);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> int count = 0;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> count += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span> ADMIN.compactRegion(mergedRegionInfo.getRegionName());<a name="line.252"></a>
+<span class="sourceLineNo">253</span> // clean up the merged region store files<a name="line.253"></a>
+<span class="sourceLineNo">254</span> // wait until merged region have reference file<a name="line.254"></a>
+<span class="sourceLineNo">255</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.255"></a>
+<span class="sourceLineNo">256</span> int newcount = 0;<a name="line.256"></a>
+<span class="sourceLineNo">257</span> while (System.currentTimeMillis() < timeout) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> newcount += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if(newcount > count) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> break;<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<a name="line.263"></a>
+<span class="sourceLineNo">264</span> Thread.sleep(50);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span> assertTrue(newcount > count);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> List<RegionServerThread> regionServerThreads = TEST_UTIL.getHBaseCluster()<a name="line.267"></a>
+<span class="sourceLineNo">268</span> .getRegionServerThreads();<a name="line.268"></a>
+<span class="sourceLineNo">269</span> for (RegionServerThread rs : regionServerThreads) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> CompactedHFilesDischarger cleaner = new CompactedHFilesDischarger(100, null,<a name="line.270"></a>
+<span class="sourceLineNo">271</span> rs.getRegionServer(), false);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> cleaner.chore();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> Thread.sleep(1000);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span> while (System.currentTimeMillis() < timeout) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> int newcount1 = 0;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> newcount1 += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span> if(newcount1 <= 1) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> break;<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> Thread.sleep(50);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> // run CatalogJanitor to clean merge references in hbase:meta and archive the<a name="line.285"></a>
+<span class="sourceLineNo">286</span> // files of merging regions<a name="line.286"></a>
+<span class="sourceLineNo">287</span> int cleaned = 0;<a name="line.287"></a>
+<span class="sourceLineNo">288</span> while (cleaned == 0) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> cleaned = ADMIN.runCatalogScan();<a name="line.289"></a>
+<span class="sourceLineNo">290</span> LOG.debug("catalog janitor returned " + cleaned);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> Thread.sleep(50);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span> assertFalse(regionAdir.toString(), fs.exists(regionAdir));<a name="line.293"></a>
+<span class="sourceLineNo">294</span> assertFalse(regionBdir.toString(), fs.exists(regionBdir));<a name="line.294"></a>
+<span class="sourceLineNo">295</span> assertTrue(cleaned > 0);<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span> mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.297"></a>
+<span class="sourceLineNo">298</span> TEST_UTIL.getConnection(), mergedRegionInfo.getRegionName());<a name="line.298"></a>
+<span class="sourceLineNo">299</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.299"></a>
+<span class="sourceLineNo">300</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.301"></a>
+<span class="sourceLineNo">302</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> } finally {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> ADMIN.enableCatalogJanitor(true);<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><a name="line.308"></a>
+<span class="sourceLineNo">309</span> /**<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * This test tests 1, merging region not online;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * 2, merging same two regions; 3, merging unknown regions.<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * They are in one test case so that we don't have to create<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * many tables, and these tests are simple.<a name="line.313"></a>
+<span class="sourceLineNo">314</span> */<a name="line.314"></a>
+<span class="sourceLineNo">315</span> @Test<a name="line.315"></a>
+<span class="sourceLineNo">316</span> public void testMerge() throws Exception {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> LOG.info("Starting testMerge");<a name="line.317"></a>
+<span class="sourceLineNo">318</span> final TableName tableName = TableName.valueOf("testMerge");<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> try {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> // Create table and load data.<a name="line.321"></a>
+<span class="sourceLineNo">322</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> RegionStates regionStates = MASTER.getAssignmentManager().getRegionStates();<a name="line.323"></a>
+<span class="sourceLineNo">324</span> List<HRegionInfo> regions = regionStates.getRegionsOfTable(tableName);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> // Fake offline one region<a name="line.325"></a>
+<span class="sourceLineNo">326</span> HRegionInfo a = regions.get(0);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> HRegionInfo b = regions.get(1);<a name="line.327"></a>
+<span class="sourceLineNo">328</span> regionStates.regionOffline(a);<a name="line.328"></a>
+<span class="sourceLineNo">329</span> try {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> // Merge offline region. Region a is offline here<a name="line.330"></a>
+<span class="sourceLineNo">331</span> ADMIN.mergeRegions(a.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), false);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> fail("Offline regions should not be able to merge");<a name="line.332"></a>
+<span class="sourceLineNo">333</span> } catch (IOException ie) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> System.out.println(ie);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> assertTrue("Exception should mention regions not online",<a name="line.335"></a>
+<span class="sourceLineNo">336</span> StringUtils.stringifyException(ie).contains("regions not online")<a name="line.336"></a>
+<span class="sourceLineNo">337</span> && ie instanceof MergeRegionException);<a name="line.337"></a>
+<span class="sourceLineNo">338</span> }<a name="line.338"></a>
+<span class="sourceLineNo">339</span> try {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // Merge the same region: b and b.<a name="line.340"></a>
+<span class="sourceLineNo">341</span> ADMIN.mergeRegions(b.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), true);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> fail("A region should not be able to merge with itself, even forcifully");<a name="line.342"></a>
+<span class="sourceLineNo">343</span> } catch (IOException ie) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> assertTrue("Exception should mention regions not online",<a name="line.344"></a>
+<span class="sourceLineNo">345</span> StringUtils.stringifyException(ie).contains("region to itself")<a name="line.345"></a>
+<span class="sourceLineNo">346</span> && ie instanceof MergeRegionException);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span> try {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> // Merge unknown regions<a name="line.349"></a>
+<span class="sourceLineNo">350</span> ADMIN.mergeRegions(Bytes.toBytes("-f1"), Bytes.toBytes("-f2"), true);<a name="line.350"></a>
+<span class="sourceLineNo">351</span> fail("Unknown region could not be merged");<a name="line.351"></a>
+<span class="sourceLineNo">352</span> } catch (IOException ie) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> assertTrue("UnknownRegionException should be thrown",<a name="line.353"></a>
+<span class="sourceLineNo">354</span> ie instanceof UnknownRegionException);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> table.close();<a name="line.356"></a>
+<span class="sourceLineNo">357</span> } finally {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> TEST_UTIL.deleteTable(tableName);<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span> @Test<a name="line.362"></a>
+<span class="sourceLineNo">363</span> public void testMergeWithReplicas() throws Exception {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> final TableName tableName = TableName.valueOf("testMergeWithReplicas");<a name="line.364"></a>
+<span class="sourceLineNo">365</span> // Create table and load data.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> createTableAndLoadData(MASTER, tableName, 5, 2);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> List<Pair<HRegionInfo, ServerName>> initialRegionToServers =<a name="line.367"></a>
+<span class="sourceLineNo">368</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.368"></a>
+<span class="sourceLineNo">369</span> TEST_UTIL.getConnection(), tableName);<a name="line.369"></a>
+<span class="sourceLineNo">370</span> // Merge 1st and 2nd region<a name="line.370"></a>
+<span class="sourceLineNo">371</span> PairOfSameType<HRegionInfo> mergedRegions = mergeRegionsAndVerifyRegionNum(MASTER, tableName,<a name="line.371"></a>
+<span class="sourceLineNo">372</span> 0, 2, 5 * 2 - 2);<a name="line.372"></a>
+<span class="sourceLineNo">373</span> List<Pair<HRegionInfo, ServerName>> currentRegionToServers =<a name="line.373"></a>
+<span class="sourceLineNo">374</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.374"></a>
+<span class="sourceLineNo">375</span> TEST_UTIL.getConnection(), tableName);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> List<HRegionInfo> initialRegions = new ArrayList<HRegionInfo>();<a name="line.376"></a>
+<span class="sourceLineNo">377</span> for (Pair<HRegionInfo, ServerName> p : initialRegionToServers) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span> initialRegions.add(p.getFirst());<a name="line.378"></a>
<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span> assertTrue(initialRegions.contains(mergedRegions.getFirst())); //this is the first region<a name="line.380"></a>
-<span class="sourceLineNo">381</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.381"></a>
-<span class="sourceLineNo">382</span> mergedRegions.getFirst(), 1))); //this is the replica of the first region<a name="line.382"></a>
-<span class="sourceLineNo">383</span> assertTrue(initialRegions.contains(mergedRegions.getSecond())); //this is the second region<a name="line.383"></a>
-<span class="sourceLineNo">384</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.384"></a>
-<span class="sourceLineNo">385</span> mergedRegions.getSecond(), 1))); //this is the replica of the second region<a name="line.385"></a>
-<span class="sourceLineNo">386</span> assertTrue(!initialRegions.contains(currentRegions.get(0))); //this is the new region<a name="line.386"></a>
-<span class="sourceLineNo">387</span> assertTrue(!initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.387"></a>
-<span class="sourceLineNo">388</span> currentRegions.get(0), 1))); //replica of the new region<a name="line.388"></a>
-<span class="sourceLineNo">389</span> assertTrue(currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.389"></a>
-<span class="sourceLineNo">390</span> currentRegions.get(0), 1))); //replica of the new region<a name="line.390"></a>
-<span class="sourceLineNo">391</span> assertTrue(!currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.391"></a>
-<span class="sourceLineNo">392</span> mergedRegions.getFirst(), 1))); //replica of the merged region<a name="line.392"></a>
-<span class="sourceLineNo">393</span> assertTrue(!currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.393"></a>
-<span class="sourceLineNo">394</span> mergedRegions.getSecond(), 1))); //replica of the merged region<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> private PairOfSameType<HRegionInfo> mergeRegionsAndVerifyRegionNum(<a name="line.397"></a>
-<span class="sourceLineNo">398</span> HMaster master, TableName tablename,<a name="line.398"></a>
-<span class="sourceLineNo">399</span> int regionAnum, int regionBnum, int expectedRegionNum) throws Exception {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> PairOfSameType<HRegionInfo> mergedRegions =<a name="line.400"></a>
-<span class="sourceLineNo">401</span> requestMergeRegion(master, tablename, regionAnum, regionBnum);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> waitAndVerifyRegionNum(master, tablename, expectedRegionNum);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> return mergedRegions;<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> private PairOfSameType<HRegionInfo> requestMergeRegion(<a name="line.406"></a>
-<span class="sourceLineNo">407</span> HMaster master, TableName tablename,<a name="line.407"></a>
-<span class="sourceLineNo">408</span> int regionAnum, int regionBnum) throws Exception {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor<a name="line.409"></a>
-<span class="sourceLineNo">410</span> .getTableRegionsAndLocations(<a name="line.410"></a>
-<span class="sourceLineNo">411</span> master.getConnection(), tablename);<a name="line.411"></a>
-<span class="sourceLineNo">412</span> HRegionInfo regionA = tableRegions.get(regionAnum).getFirst();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> HRegionInfo regionB = tableRegions.get(regionBnum).getFirst();<a name="line.413"></a>
-<span class="sourceLineNo">414</span> TEST_UTIL.getHBaseAdmin().mergeRegions(<a name="line.414"></a>
-<span class="sourceLineNo">415</span> regionA.getEncodedNameAsBytes(),<a name="line.415"></a>
-<span class="sourceLineNo">416</span> regionB.getEncodedNameAsBytes(), false);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return new PairOfSameType<HRegionInfo>(regionA, regionB);<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> private void waitAndVerifyRegionNum(HMaster master, TableName tablename,<a name="line.420"></a>
-<span class="sourceLineNo">421</span> int expectedRegionNum) throws Exception {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> List<Pair<HRegionInfo, ServerName>> tableRegionsInMeta;<a name="line.422"></a>
-<span class="sourceLineNo">423</span> List<HRegionInfo> tableRegionsInMaster;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> while (System.currentTimeMillis() < timeout) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> tableRegionsInMeta = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.426"></a>
-<span class="sourceLineNo">427</span> master.getConnection(), tablename);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> tableRegionsInMaster = master.getAssignmentManager().getRegionStates()<a name="line.428"></a>
-<span class="sourceLineNo">429</span> .getRegionsOfTable(tablename);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> if (tableRegionsInMeta.size() == expectedRegionNum<a name="line.430"></a>
-<span class="sourceLineNo">431</span> && tableRegionsInMaster.size() == expectedRegionNum) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> break;<a name="line.432"></a>
-<span class="sourceLineNo">433</span> }<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Thread.sleep(250);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> }<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span> tableRegionsInMeta = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.437"></a>
-<span class="sourceLineNo">438</span> master.getConnection(), tablename);<a name="line.438"></a>
-<span class="sourceLineNo">439</span> LOG.info("Regions after merge:" + Joiner.on(',').join(tableRegionsInMeta));<a name="line.439"></a>
-<span class="sourceLineNo">440</span> assertEquals(expectedRegionNum, tableRegionsInMeta.size());<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> private Table createTableAndLoadData(HMaster master, TableName tablename)<a name="line.443"></a>
-<span class="sourceLineNo">444</span> throws Exception {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> return createTableAndLoadData(master, tablename, INITIAL_REGION_NUM, 1);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span> private Table createTableAndLoadData(HMaster master, TableName tablename,<a name="line.448"></a>
-<span class="sourceLineNo">449</span> int numRegions, int replication) throws Exception {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> assertTrue("ROWSIZE must > numregions:" + numRegions, ROWSIZE > numRegions);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> byte[][] splitRows = new byte[numRegions - 1][];<a name="line.451"></a>
-<span class="sourceLineNo">452</span> for (int i = 0; i < splitRows.length; i++) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> splitRows[i] = ROWS[(i + 1) * ROWSIZE / numRegions];<a name="line.453"></a>
-<span class="sourceLineNo">454</span> }<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> Table table = TEST_UTIL.createTable(tablename, FAMILYNAME, splitRows);<a name="line.456"></a>
-<span class="sourceLineNo">457</span> if (replication > 1) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> HBaseTestingUtility.setReplicas(admin, tablename, replication);<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
-<span class="sourceLineNo">460</span> loadData(table);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> verifyRowCount(table, ROWSIZE);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> // sleep here is an ugly hack to allow region transitions to finish<a name="line.463"></a>
-<span class="sourceLineNo">464</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> List<Pair<HRegionInfo, ServerName>> tableRegions;<a name="line.465"></a>
-<span class="sourceLineNo">466</span> while (System.currentTimeMillis() < timeout) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> tableRegions = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.467"></a>
-<span class="sourceLineNo">468</span> master.getConnection(), tablename);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (tableRegions.size() == numRegions * replication)<a name="line.469"></a>
-<span class="sourceLineNo">470</span> break;<a name="line.470"></a>
-<span class="sourceLineNo">471</span> Thread.sleep(250);<a name="line.471"></a>
-<span class="sourceLineNo">472</span> }<a name="line.472"></a>
-<span class="sourceLineNo">473</span><a name="line.473"></a>
-<span class="sourceLineNo">474</span> tableRegions = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.474"></a>
-<span class="sourceLineNo">475</span> master.getConnection(), tablename);<a name="line.475"></a>
-<span class="sourceLineNo">476</span> LOG.info("Regions after load: " + Joiner.on(',').join(tableRegions));<a name="line.476"></a>
-<span class="sourceLineNo">477</span> assertEquals(numRegions * replication, tableRegions.size());<a name="line.477"></a>
-<span class="sourceLineNo">478</span> return table;<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span> private static byte[][] makeN(byte[] base, int n) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span> byte[][] ret = new byte[n][];<a name="line.482"></a>
-<span class="sourceLineNo">483</span> for (int i = 0; i < n; i++) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> ret[i] = Bytes.add(base, Bytes.toBytes(String.format("%04d", i)));<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span> return ret;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> }<a name="line.487"></a>
-<span class="sourceLineNo">488</span><a name="line.488"></a>
-<span class="sourceLineNo">489</span> private void loadData(Table table) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> for (int i = 0; i < ROWSIZE; i++) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> Put put = new Put(ROWS[i]);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> put.addColumn(FAMILYNAME, QUALIFIER, Bytes.toBytes(i));<a name="line.492"></a>
-<span class="sourceLineNo">493</span> table.put(put);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> }<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> private void verifyRowCount(Table table, int expectedRegionNum)<a name="line.497"></a>
-<span class="sourceLineNo">498</span> throws IOException {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> ResultScanner scanner = table.getScanner(new Scan());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> int rowCount = 0;<a name="line.500"></a>
-<span class="sourceLineNo">501</span> while (scanner.next() != null) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> rowCount++;<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span> assertEquals(expectedRegionNum, rowCount);<a name="line.504"></a>
-<span class="sourceLineNo">505</span> scanner.close();<a name="line.505"></a>
-<span class="sourceLineNo">506</span> }<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> // Make it public so that JVMClusterUtil can access it.<a name="line.508"></a>
-<span class="sourceLineNo">509</span> public static class MyMaster extends HMaster {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> public MyMaster(Configuration conf, CoordinatedStateManager cp)<a name="line.510"></a>
-<span class="sourceLineNo">511</span> throws IOException, KeeperException,<a name="line.511"></a>
-<span class="sourceLineNo">512</span> InterruptedException {<a name="line.512"></a>
-<span class="sourceLineNo">513</span> super(conf, cp);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> @Override<a name="line.516"></a>
-<span class="sourceLineNo">517</span> protected RSRpcServices createRpcServices() throws IOException {<a name="line.517"></a>
-<span class="sourceLineNo">518</span> return new MyMasterRpcServices(this);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
-<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span> static class MyMasterRpcServices extends MasterRpcServices {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> static AtomicBoolean enabled = new AtomicBoolean(false);<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> private HMaster myMaster;<a name="line.525"></a>
-<span class="sourceLineNo">526</span> public MyMasterRpcServices(HMaster master) throws IOException {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> super(master);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> myMaster = master;<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span> @Override<a name="line.531"></a>
-<span class="sourceLineNo">532</span> public ReportRegionStateTransitionResponse reportRegionStateTransition(RpcController c,<a name="line.532"></a>
-<span class="sourceLineNo">533</span> ReportRegionStateTransitionRequest req) throws ServiceException {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> ReportRegionStateTransitionResponse resp = super.reportRegionStateTransition(c, req);<a name="line.534"></a>
-<span class="sourceLineNo">535</span> if (enabled.get() && req.getTransition(0).getTransitionCode()<a name="line.535"></a>
-<span class="sourceLineNo">536</span> == TransitionCode.READY_TO_MERGE && !resp.hasErrorMessage()) {<a name="line.536"></a>
-<span class="sourceLineNo">537</span> RegionStates regionStates = myMaster.getAssignmentManager().getRegionStates();<a name="line.537"></a>
-<span class="sourceLineNo">538</span> for (RegionState regionState: regionStates.getRegionsInTransition().values()) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span> // Find the merging_new region and remove it<a name="line.539"></a>
-<span class="sourceLineNo">540</span> if (regionState.isMergingNew()) {<a name="line.540"></a>
-<span class="sourceLineNo">541</span> regionStates.deleteRegion(regionState.getRegion());<a name="line.541"></a>
-<span class="sourceLineNo">542</span> }<a name="line.542"></a>
-<span class="sourceLineNo">543</span> }<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span> return resp;<a name="line.545"></a>
-<span class="sourceLineNo">546</span> }<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>}<a name="line.548"></a>
+<span class="sourceLineNo">380</span> List<HRegionInfo> currentRegions = new ArrayList<HRegionInfo>();<a name="line.380"></a>
+<span class="sourceLineNo">381</span> for (Pair<HRegionInfo, ServerName> p : currentRegionToServers) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> currentRegions.add(p.getFirst());<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span> assertTrue(initialRegions.contains(mergedRegions.getFirst())); //this is the first region<a name="line.384"></a>
+<span class="sourceLineNo">385</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.385"></a>
+<span class="sourceLineNo">386</span> mergedRegions.getFirst(), 1))); //this is the replica of the first region<a name="line.386"></a>
+<span class="sourceLineNo">387</span> assertTrue(initialRegions.contains(mergedRegions.getSecond())); //this is the second region<a name="line.387"></a>
+<span class="sourceLineNo">388</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.388"></a>
+<span class="sourceLineNo">389</span> mergedRegions.getSecond(), 1))); //this is the replica of the second region<a name="line.389"></a>
+<span class="sourceLineNo">390</span> assertTrue(!initialRegions.contains(currentRegions.get(0))); //this is the new region<a name="line.390"></a>
+<span clas
<TRUNCATED>
[10/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
index 13e0e7c..1bdbf69 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
@@ -42,518 +42,522 @@
<span class="sourceLineNo">034</span>import org.apache.hadoop.conf.Configuration;<a name="line.34"></a>
<span class="sourceLineNo">035</span>import org.apache.hadoop.fs.FileSystem;<a name="line.35"></a>
<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.Path;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HConstants;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.ServerName;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.TableName;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.UnknownRegionException;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Put;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.client.RegionReplicaUtil;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.Result;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.Table;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.exceptions.MergeRegionException;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.master.AssignmentManager;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.master.MasterRpcServices;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.master.RegionState.State;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.master.RegionStates;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.util.PairOfSameType;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import org.apache.hadoop.util.StringUtils;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import org.apache.zookeeper.KeeperException;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>import org.junit.AfterClass;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>import org.junit.BeforeClass;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>import org.junit.Test;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>import org.junit.experimental.categories.Category;<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>import com.google.common.base.Joiner;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>import com.google.protobuf.RpcController;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>import com.google.protobuf.ServiceException;<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>/**<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * Like {@link TestRegionMergeTransaction} in that we're testing<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * {@link RegionMergeTransactionImpl} only the below tests are against a running<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * cluster where {@link TestRegionMergeTransaction} is tests against bare<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * {@link HRegion}.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> */<a name="line.89"></a>
-<span class="sourceLineNo">090</span>@Category({RegionServerTests.class, LargeTests.class})<a name="line.90"></a>
-<span class="sourceLineNo">091</span>public class TestRegionMergeTransactionOnCluster {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> private static final Log LOG = LogFactory<a name="line.92"></a>
-<span class="sourceLineNo">093</span> .getLog(TestRegionMergeTransactionOnCluster.class);<a name="line.93"></a>
-<span class="sourceLineNo">094</span> private static final int NB_SERVERS = 3;<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span> private static final byte[] FAMILYNAME = Bytes.toBytes("fam");<a name="line.96"></a>
-<span class="sourceLineNo">097</span> private static final byte[] QUALIFIER = Bytes.toBytes("q");<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> private static byte[] ROW = Bytes.toBytes("testRow");<a name="line.99"></a>
-<span class="sourceLineNo">100</span> private static final int INITIAL_REGION_NUM = 10;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> private static final int ROWSIZE = 200;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> private static byte[][] ROWS = makeN(ROW, ROWSIZE);<a name="line.102"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.CategoryBasedTimeout;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HConstants;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.ServerName;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.TableName;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.UnknownRegionException;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.client.Put;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.RegionReplicaUtil;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.Result;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.client.Table;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.exceptions.MergeRegionException;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.master.AssignmentManager;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.master.MasterRpcServices;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.master.RegionState.State;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.master.RegionStates;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import org.apache.hadoop.hbase.util.PairOfSameType;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import org.apache.hadoop.util.StringUtils;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>import org.apache.zookeeper.KeeperException;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>import org.junit.AfterClass;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>import org.junit.BeforeClass;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>import org.junit.Rule;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>import org.junit.Test;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>import org.junit.experimental.categories.Category;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>import org.junit.rules.TestRule;<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>import com.google.common.base.Joiner;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>import com.google.protobuf.RpcController;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>import com.google.protobuf.ServiceException;<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>/**<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * Like {@link TestRegionMergeTransaction} in that we're testing<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * {@link RegionMergeTransactionImpl} only the below tests are against a running<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * cluster where {@link TestRegionMergeTransaction} is tests against bare<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * {@link HRegion}.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> */<a name="line.92"></a>
+<span class="sourceLineNo">093</span>@Category({RegionServerTests.class, LargeTests.class})<a name="line.93"></a>
+<span class="sourceLineNo">094</span>public class TestRegionMergeTransactionOnCluster {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> private static final Log LOG = LogFactory<a name="line.95"></a>
+<span class="sourceLineNo">096</span> .getLog(TestRegionMergeTransactionOnCluster.class);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> @Rule public final TestRule timeout = CategoryBasedTimeout.builder().withTimeout(this.getClass()).<a name="line.97"></a>
+<span class="sourceLineNo">098</span> withLookingForStuckThread(true).build();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> private static final int NB_SERVERS = 3;<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span> private static final byte[] FAMILYNAME = Bytes.toBytes("fam");<a name="line.101"></a>
+<span class="sourceLineNo">102</span> private static final byte[] QUALIFIER = Bytes.toBytes("q");<a name="line.102"></a>
<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> private static int waitTime = 60 * 1000;<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> private static HMaster master;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> private static Admin admin;<a name="line.109"></a>
+<span class="sourceLineNo">104</span> private static byte[] ROW = Bytes.toBytes("testRow");<a name="line.104"></a>
+<span class="sourceLineNo">105</span> private static final int INITIAL_REGION_NUM = 10;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> private static final int ROWSIZE = 200;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> private static byte[][] ROWS = makeN(ROW, ROWSIZE);<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> private static int waitTime = 60 * 1000;<a name="line.109"></a>
<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> @BeforeClass<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public static void beforeAllTests() throws Exception {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> // Start a cluster<a name="line.113"></a>
-<span class="sourceLineNo">114</span> TEST_UTIL.startMiniCluster(1, NB_SERVERS, null, MyMaster.class, null);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> master = cluster.getMaster();<a name="line.116"></a>
-<span class="sourceLineNo">117</span> master.balanceSwitch(false);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> admin = TEST_UTIL.getHBaseAdmin();<a name="line.118"></a>
-<span class="sourceLineNo">119</span> }<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> @AfterClass<a name="line.121"></a>
-<span class="sourceLineNo">122</span> public static void afterAllTests() throws Exception {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> TEST_UTIL.shutdownMiniCluster();<a name="line.123"></a>
+<span class="sourceLineNo">111</span> static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> private static HMaster MASTER;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> private static Admin ADMIN;<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> @BeforeClass<a name="line.116"></a>
+<span class="sourceLineNo">117</span> public static void beforeAllTests() throws Exception {<a name="line.117"></a>
+<span class="sourceLineNo">118</span> // Start a cluster<a name="line.118"></a>
+<span class="sourceLineNo">119</span> TEST_UTIL.startMiniCluster(1, NB_SERVERS, null, MyMaster.class, null);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.120"></a>
+<span class="sourceLineNo">121</span> MASTER = cluster.getMaster();<a name="line.121"></a>
+<span class="sourceLineNo">122</span> MASTER.balanceSwitch(false);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> ADMIN = TEST_UTIL.getConnection().getAdmin();<a name="line.123"></a>
<span class="sourceLineNo">124</span> }<a name="line.124"></a>
<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> @Test<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public void testWholesomeMerge() throws Exception {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> LOG.info("Starting testWholesomeMerge");<a name="line.128"></a>
-<span class="sourceLineNo">129</span> final TableName tableName =<a name="line.129"></a>
-<span class="sourceLineNo">130</span> TableName.valueOf("testWholesomeMerge");<a name="line.130"></a>
+<span class="sourceLineNo">126</span> @AfterClass<a name="line.126"></a>
+<span class="sourceLineNo">127</span> public static void afterAllTests() throws Exception {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> TEST_UTIL.shutdownMiniCluster();<a name="line.128"></a>
+<span class="sourceLineNo">129</span> if (ADMIN != null) ADMIN.close();<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> // Create table and load data.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> Table table = createTableAndLoadData(master, tableName);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> // Merge 1st and 2nd region<a name="line.134"></a>
-<span class="sourceLineNo">135</span> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,<a name="line.135"></a>
-<span class="sourceLineNo">136</span> INITIAL_REGION_NUM - 1);<a name="line.136"></a>
+<span class="sourceLineNo">132</span> @Test<a name="line.132"></a>
+<span class="sourceLineNo">133</span> public void testWholesomeMerge() throws Exception {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> LOG.info("Starting testWholesomeMerge");<a name="line.134"></a>
+<span class="sourceLineNo">135</span> final TableName tableName =<a name="line.135"></a>
+<span class="sourceLineNo">136</span> TableName.valueOf("testWholesomeMerge");<a name="line.136"></a>
<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> // Merge 2nd and 3th region<a name="line.138"></a>
-<span class="sourceLineNo">139</span> PairOfSameType<HRegionInfo> mergedRegions =<a name="line.139"></a>
-<span class="sourceLineNo">140</span> mergeRegionsAndVerifyRegionNum(master, tableName, 1, 2,<a name="line.140"></a>
-<span class="sourceLineNo">141</span> INITIAL_REGION_NUM - 2);<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> verifyRowCount(table, ROWSIZE);<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> // Randomly choose one of the two merged regions<a name="line.145"></a>
-<span class="sourceLineNo">146</span> HRegionInfo hri = RandomUtils.nextBoolean() ?<a name="line.146"></a>
-<span class="sourceLineNo">147</span> mergedRegions.getFirst() : mergedRegions.getSecond();<a name="line.147"></a>
-<span class="sourceLineNo">148</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> AssignmentManager am = cluster.getMaster().getAssignmentManager();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> RegionStates regionStates = am.getRegionStates();<a name="line.150"></a>
-<span class="sourceLineNo">151</span> long start = EnvironmentEdgeManager.currentTime();<a name="line.151"></a>
-<span class="sourceLineNo">152</span> while (!regionStates.isRegionInState(hri, State.MERGED)) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> assertFalse("Timed out in waiting one merged region to be in state MERGED",<a name="line.153"></a>
-<span class="sourceLineNo">154</span> EnvironmentEdgeManager.currentTime() - start > 60000);<a name="line.154"></a>
-<span class="sourceLineNo">155</span> Thread.sleep(500);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> // We should not be able to assign it again<a name="line.158"></a>
-<span class="sourceLineNo">159</span> am.assign(hri, true);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> assertFalse("Merged region can't be assigned",<a name="line.160"></a>
-<span class="sourceLineNo">161</span> regionStates.isRegionInTransition(hri));<a name="line.161"></a>
-<span class="sourceLineNo">162</span> assertTrue(regionStates.isRegionInState(hri, State.MERGED));<a name="line.162"></a>
+<span class="sourceLineNo">138</span> // Create table and load data.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> // Merge 1st and 2nd region<a name="line.140"></a>
+<span class="sourceLineNo">141</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1,<a name="line.141"></a>
+<span class="sourceLineNo">142</span> INITIAL_REGION_NUM - 1);<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> // Merge 2nd and 3th region<a name="line.144"></a>
+<span class="sourceLineNo">145</span> PairOfSameType<HRegionInfo> mergedRegions =<a name="line.145"></a>
+<span class="sourceLineNo">146</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 1, 2,<a name="line.146"></a>
+<span class="sourceLineNo">147</span> INITIAL_REGION_NUM - 2);<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> verifyRowCount(table, ROWSIZE);<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> // Randomly choose one of the two merged regions<a name="line.151"></a>
+<span class="sourceLineNo">152</span> HRegionInfo hri = RandomUtils.nextBoolean() ?<a name="line.152"></a>
+<span class="sourceLineNo">153</span> mergedRegions.getFirst() : mergedRegions.getSecond();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.154"></a>
+<span class="sourceLineNo">155</span> AssignmentManager am = cluster.getMaster().getAssignmentManager();<a name="line.155"></a>
+<span class="sourceLineNo">156</span> RegionStates regionStates = am.getRegionStates();<a name="line.156"></a>
+<span class="sourceLineNo">157</span> long start = EnvironmentEdgeManager.currentTime();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> while (!regionStates.isRegionInState(hri, State.MERGED)) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> assertFalse("Timed out in waiting one merged region to be in state MERGED",<a name="line.159"></a>
+<span class="sourceLineNo">160</span> EnvironmentEdgeManager.currentTime() - start > 60000);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> Thread.sleep(500);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> // We should not be able to unassign it either<a name="line.164"></a>
-<span class="sourceLineNo">165</span> am.unassign(hri, null);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> assertFalse("Merged region can't be unassigned",<a name="line.166"></a>
+<span class="sourceLineNo">164</span> // We should not be able to assign it again<a name="line.164"></a>
+<span class="sourceLineNo">165</span> am.assign(hri, true);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> assertFalse("Merged region can't be assigned",<a name="line.166"></a>
<span class="sourceLineNo">167</span> regionStates.isRegionInTransition(hri));<a name="line.167"></a>
<span class="sourceLineNo">168</span> assertTrue(regionStates.isRegionInState(hri, State.MERGED));<a name="line.168"></a>
<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> table.close();<a name="line.170"></a>
-<span class="sourceLineNo">171</span> }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> /**<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * Not really restarting the master. Simulate it by clear of new region<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * state since it is not persisted, will be lost after master restarts.<a name="line.175"></a>
-<span class="sourceLineNo">176</span> */<a name="line.176"></a>
-<span class="sourceLineNo">177</span> @Test<a name="line.177"></a>
-<span class="sourceLineNo">178</span> public void testMergeAndRestartingMaster() throws Exception {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> LOG.info("Starting testMergeAndRestartingMaster");<a name="line.179"></a>
-<span class="sourceLineNo">180</span> final TableName tableName = TableName.valueOf("testMergeAndRestartingMaster");<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> // Create table and load data.<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Table table = createTableAndLoadData(master, tableName);<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> try {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> MyMasterRpcServices.enabled.set(true);<a name="line.186"></a>
+<span class="sourceLineNo">170</span> // We should not be able to unassign it either<a name="line.170"></a>
+<span class="sourceLineNo">171</span> am.unassign(hri, null);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> assertFalse("Merged region can't be unassigned",<a name="line.172"></a>
+<span class="sourceLineNo">173</span> regionStates.isRegionInTransition(hri));<a name="line.173"></a>
+<span class="sourceLineNo">174</span> assertTrue(regionStates.isRegionInState(hri, State.MERGED));<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> table.close();<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span> /**<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * Not really restarting the master. Simulate it by clear of new region<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * state since it is not persisted, will be lost after master restarts.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> */<a name="line.182"></a>
+<span class="sourceLineNo">183</span> @Test<a name="line.183"></a>
+<span class="sourceLineNo">184</span> public void testMergeAndRestartingMaster() throws Exception {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.info("Starting testMergeAndRestartingMaster");<a name="line.185"></a>
+<span class="sourceLineNo">186</span> final TableName tableName = TableName.valueOf("testMergeAndRestartingMaster");<a name="line.186"></a>
<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> // Merge 1st and 2nd region<a name="line.188"></a>
-<span class="sourceLineNo">189</span> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,<a name="line.189"></a>
-<span class="sourceLineNo">190</span> INITIAL_REGION_NUM - 1);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> } finally {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> MyMasterRpcServices.enabled.set(false);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> table.close();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> @SuppressWarnings("deprecation")<a name="line.198"></a>
-<span class="sourceLineNo">199</span> @Test<a name="line.199"></a>
-<span class="sourceLineNo">200</span> public void testCleanMergeReference() throws Exception {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> LOG.info("Starting testCleanMergeReference");<a name="line.201"></a>
-<span class="sourceLineNo">202</span> admin.enableCatalogJanitor(false);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> try {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> final TableName tableName =<a name="line.204"></a>
-<span class="sourceLineNo">205</span> TableName.valueOf("testCleanMergeReference");<a name="line.205"></a>
-<span class="sourceLineNo">206</span> // Create table and load data.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> Table table = createTableAndLoadData(master, tableName);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> // Merge 1st and 2nd region<a name="line.208"></a>
-<span class="sourceLineNo">209</span> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,<a name="line.209"></a>
-<span class="sourceLineNo">210</span> INITIAL_REGION_NUM - 1);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> verifyRowCount(table, ROWSIZE);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> table.close();<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor<a name="line.214"></a>
-<span class="sourceLineNo">215</span> .getTableRegionsAndLocations(master.getConnection(), tableName);<a name="line.215"></a>
-<span class="sourceLineNo">216</span> HRegionInfo mergedRegionInfo = tableRegions.get(0).getFirst();<a name="line.216"></a>
-<span class="sourceLineNo">217</span> HTableDescriptor tableDescriptor = master.getTableDescriptors().get(<a name="line.217"></a>
-<span class="sourceLineNo">218</span> tableName);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> Result mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.219"></a>
-<span class="sourceLineNo">220</span> master.getConnection(), mergedRegionInfo.getRegionName());<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> // contains merge reference in META<a name="line.222"></a>
-<span class="sourceLineNo">223</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.223"></a>
-<span class="sourceLineNo">224</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.224"></a>
-<span class="sourceLineNo">225</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.225"></a>
-<span class="sourceLineNo">226</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span> // merging regions' directory are in the file system all the same<a name="line.228"></a>
-<span class="sourceLineNo">229</span> PairOfSameType<HRegionInfo> p = MetaTableAccessor.getMergeRegions(mergedRegionResult);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> HRegionInfo regionA = p.getFirst();<a name="line.230"></a>
-<span class="sourceLineNo">231</span> HRegionInfo regionB = p.getSecond();<a name="line.231"></a>
-<span class="sourceLineNo">232</span> FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.232"></a>
-<span class="sourceLineNo">233</span> Path rootDir = master.getMasterFileSystem().getRootDir();<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span> Path tabledir = FSUtils.getTableDir(rootDir, mergedRegionInfo.getTable());<a name="line.235"></a>
-<span class="sourceLineNo">236</span> Path regionAdir = new Path(tabledir, regionA.getEncodedName());<a name="line.236"></a>
-<span class="sourceLineNo">237</span> Path regionBdir = new Path(tabledir, regionB.getEncodedName());<a name="line.237"></a>
-<span class="sourceLineNo">238</span> assertTrue(fs.exists(regionAdir));<a name="line.238"></a>
-<span class="sourceLineNo">239</span> assertTrue(fs.exists(regionBdir));<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> HColumnDescriptor[] columnFamilies = tableDescriptor.getColumnFamilies();<a name="line.241"></a>
-<span class="sourceLineNo">242</span> HRegionFileSystem hrfs = new HRegionFileSystem(<a name="line.242"></a>
-<span class="sourceLineNo">243</span> TEST_UTIL.getConfiguration(), fs, tabledir, mergedRegionInfo);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> int count = 0;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> count += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> admin.compactRegion(mergedRegionInfo.getRegionName());<a name="line.248"></a>
-<span class="sourceLineNo">249</span> // clean up the merged region store files<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // wait until merged region have reference file<a name="line.250"></a>
-<span class="sourceLineNo">251</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> int newcount = 0;<a name="line.252"></a>
-<span class="sourceLineNo">253</span> while (System.currentTimeMillis() < timeout) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> newcount += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> if(newcount > count) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> break;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span> Thread.sleep(50);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span> assertTrue(newcount > count);<a name="line.262"></a>
-<span class="sourceLineNo">263</span> List<RegionServerThread> regionServerThreads = TEST_UTIL.getHBaseCluster()<a name="line.263"></a>
-<span class="sourceLineNo">264</span> .getRegionServerThreads();<a name="line.264"></a>
-<span class="sourceLineNo">265</span> for (RegionServerThread rs : regionServerThreads) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> CompactedHFilesDischarger cleaner = new CompactedHFilesDischarger(100, null,<a name="line.266"></a>
-<span class="sourceLineNo">267</span> rs.getRegionServer(), false);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> cleaner.chore();<a name="line.268"></a>
-<span class="sourceLineNo">269</span> Thread.sleep(1000);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> while (System.currentTimeMillis() < timeout) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> int newcount1 = 0;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> newcount1 += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> if(newcount1 <= 1) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> break;<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> Thread.sleep(50);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span> // run CatalogJanitor to clean merge references in hbase:meta and archive the<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // files of merging regions<a name="line.282"></a>
-<span class="sourceLineNo">283</span> int cleaned = 0;<a name="line.283"></a>
-<span class="sourceLineNo">284</span> while (cleaned == 0) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> cleaned = admin.runCatalogScan();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> LOG.debug("catalog janitor returned " + cleaned);<a name="line.286"></a>
-<span class="sourceLineNo">287</span> Thread.sleep(50);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> assertFalse(regionAdir.toString(), fs.exists(regionAdir));<a name="line.289"></a>
-<span class="sourceLineNo">290</span> assertFalse(regionBdir.toString(), fs.exists(regionBdir));<a name="line.290"></a>
-<span class="sourceLineNo">291</span> assertTrue(cleaned > 0);<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.293"></a>
-<span class="sourceLineNo">294</span> master.getConnection(), mergedRegionInfo.getRegionName());<a name="line.294"></a>
-<span class="sourceLineNo">295</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.295"></a>
-<span class="sourceLineNo">296</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.297"></a>
-<span class="sourceLineNo">298</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> } finally {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> admin.enableCatalogJanitor(true);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<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> * This test tests 1, merging region not online;<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * 2, merging same two regions; 3, merging unknown regions.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * They are in one test case so that we don't have to create<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * many tables, and these tests are simple.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> */<a name="line.310"></a>
-<span class="sourceLineNo">311</span> @Test<a name="line.311"></a>
-<span class="sourceLineNo">312</span> public void testMerge() throws Exception {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> LOG.info("Starting testMerge");<a name="line.313"></a>
-<span class="sourceLineNo">314</span> final TableName tableName = TableName.valueOf("testMerge");<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> try {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> // Create table and load data.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> Table table = createTableAndLoadData(master, tableName);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> RegionStates regionStates = master.getAssignmentManager().getRegionStates();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> List<HRegionInfo> regions = regionStates.getRegionsOfTable(tableName);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> // Fake offline one region<a name="line.321"></a>
-<span class="sourceLineNo">322</span> HRegionInfo a = regions.get(0);<a name="line.322"></a>
-<span class="sourceLineNo">323</span> HRegionInfo b = regions.get(1);<a name="line.323"></a>
-<span class="sourceLineNo">324</span> regionStates.regionOffline(a);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> try {<a name="line.325"></a>
-<span class="sourceLineNo">326</span> // Merge offline region. Region a is offline here<a name="line.326"></a>
-<span class="sourceLineNo">327</span> admin.mergeRegions(a.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), false);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> fail("Offline regions should not be able to merge");<a name="line.328"></a>
-<span class="sourceLineNo">329</span> } catch (IOException ie) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> System.out.println(ie);<a name="line.330"></a>
-<span class="sourceLineNo">331</span> assertTrue("Exception should mention regions not online",<a name="line.331"></a>
-<span class="sourceLineNo">332</span> StringUtils.stringifyException(ie).contains("regions not online")<a name="line.332"></a>
-<span class="sourceLineNo">333</span> && ie instanceof MergeRegionException);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> try {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> // Merge the same region: b and b.<a name="line.336"></a>
-<span class="sourceLineNo">337</span> admin.mergeRegions(b.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), true);<a name="line.337"></a>
-<span class="sourceLineNo">338</span> fail("A region should not be able to merge with itself, even forcifully");<a name="line.338"></a>
-<span class="sourceLineNo">339</span> } catch (IOException ie) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> assertTrue("Exception should mention regions not online",<a name="line.340"></a>
-<span class="sourceLineNo">341</span> StringUtils.stringifyException(ie).contains("region to itself")<a name="line.341"></a>
-<span class="sourceLineNo">342</span> && ie instanceof MergeRegionException);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span> try {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> // Merge unknown regions<a name="line.345"></a>
-<span class="sourceLineNo">346</span> admin.mergeRegions(Bytes.toBytes("-f1"), Bytes.toBytes("-f2"), true);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> fail("Unknown region could not be merged");<a name="line.347"></a>
-<span class="sourceLineNo">348</span> } catch (IOException ie) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> assertTrue("UnknownRegionException should be thrown",<a name="line.349"></a>
-<span class="sourceLineNo">350</span> ie instanceof UnknownRegionException);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span> table.close();<a name="line.352"></a>
-<span class="sourceLineNo">353</span> } finally {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> TEST_UTIL.deleteTable(tableName);<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span> @Test<a name="line.358"></a>
-<span class="sourceLineNo">359</span> public void testMergeWithReplicas() throws Exception {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> final TableName tableName = TableName.valueOf("testMergeWithReplicas");<a name="line.360"></a>
-<span class="sourceLineNo">361</span> // Create table and load data.<a name="line.361"></a>
-<span class="sourceLineNo">362</span> createTableAndLoadData(master, tableName, 5, 2);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> List<Pair<HRegionInfo, ServerName>> initialRegionToServers =<a name="line.363"></a>
-<span class="sourceLineNo">364</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.364"></a>
-<span class="sourceLineNo">365</span> master.getConnection(), tableName);<a name="line.365"></a>
-<span class="sourceLineNo">366</span> // Merge 1st and 2nd region<a name="line.366"></a>
-<span class="sourceLineNo">367</span> PairOfSameType<HRegionInfo> mergedRegions = mergeRegionsAndVerifyRegionNum(master, tableName,<a name="line.367"></a>
-<span class="sourceLineNo">368</span> 0, 2, 5 * 2 - 2);<a name="line.368"></a>
-<span class="sourceLineNo">369</span> List<Pair<HRegionInfo, ServerName>> currentRegionToServers =<a name="line.369"></a>
-<span class="sourceLineNo">370</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.370"></a>
-<span class="sourceLineNo">371</span> master.getConnection(), tableName);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> List<HRegionInfo> initialRegions = new ArrayList<HRegionInfo>();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> for (Pair<HRegionInfo, ServerName> p : initialRegionToServers) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> initialRegions.add(p.getFirst());<a name="line.374"></a>
-<span class="sourceLineNo">375</span> }<a name="line.375"></a>
-<span class="sourceLineNo">376</span> List<HRegionInfo> currentRegions = new ArrayList<HRegionInfo>();<a name="line.376"></a>
-<span class="sourceLineNo">377</span> for (Pair<HRegionInfo, ServerName> p : currentRegionToServers) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> currentRegions.add(p.getFirst());<a name="line.378"></a>
+<span class="sourceLineNo">188</span> // Create table and load data.<a name="line.188"></a>
+<span class="sourceLineNo">189</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span> try {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> MyMasterRpcServices.enabled.set(true);<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span> // Merge 1st and 2nd region<a name="line.194"></a>
+<span class="sourceLineNo">195</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1, INITIAL_REGION_NUM - 1);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> } finally {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> MyMasterRpcServices.enabled.set(false);<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> table.close();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> @Test<a name="line.203"></a>
+<span class="sourceLineNo">204</span> public void testCleanMergeReference() throws Exception {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> LOG.info("Starting testCleanMergeReference");<a name="line.205"></a>
+<span class="sourceLineNo">206</span> ADMIN.enableCatalogJanitor(false);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> try {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> final TableName tableName =<a name="line.208"></a>
+<span class="sourceLineNo">209</span> TableName.valueOf("testCleanMergeReference");<a name="line.209"></a>
+<span class="sourceLineNo">210</span> // Create table and load data.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> // Merge 1st and 2nd region<a name="line.212"></a>
+<span class="sourceLineNo">213</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1,<a name="line.213"></a>
+<span class="sourceLineNo">214</span> INITIAL_REGION_NUM - 1);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> verifyRowCount(table, ROWSIZE);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> table.close();<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor<a name="line.218"></a>
+<span class="sourceLineNo">219</span> .getTableRegionsAndLocations(MASTER.getConnection(), tableName);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> HRegionInfo mergedRegionInfo = tableRegions.get(0).getFirst();<a name="line.220"></a>
+<span class="sourceLineNo">221</span> HTableDescriptor tableDescriptor = MASTER.getTableDescriptors().get(<a name="line.221"></a>
+<span class="sourceLineNo">222</span> tableName);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> Result mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.223"></a>
+<span class="sourceLineNo">224</span> MASTER.getConnection(), mergedRegionInfo.getRegionName());<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> // contains merge reference in META<a name="line.226"></a>
+<span class="sourceLineNo">227</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.227"></a>
+<span class="sourceLineNo">228</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.229"></a>
+<span class="sourceLineNo">230</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> // merging regions' directory are in the file system all the same<a name="line.232"></a>
+<span class="sourceLineNo">233</span> PairOfSameType<HRegionInfo> p = MetaTableAccessor.getMergeRegions(mergedRegionResult);<a name="line.233"></a>
+<span class="sourceLineNo">234</span> HRegionInfo regionA = p.getFirst();<a name="line.234"></a>
+<span class="sourceLineNo">235</span> HRegionInfo regionB = p.getSecond();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> FileSystem fs = MASTER.getMasterFileSystem().getFileSystem();<a name="line.236"></a>
+<span class="sourceLineNo">237</span> Path rootDir = MASTER.getMasterFileSystem().getRootDir();<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span> Path tabledir = FSUtils.getTableDir(rootDir, mergedRegionInfo.getTable());<a name="line.239"></a>
+<span class="sourceLineNo">240</span> Path regionAdir = new Path(tabledir, regionA.getEncodedName());<a name="line.240"></a>
+<span class="sourceLineNo">241</span> Path regionBdir = new Path(tabledir, regionB.getEncodedName());<a name="line.241"></a>
+<span class="sourceLineNo">242</span> assertTrue(fs.exists(regionAdir));<a name="line.242"></a>
+<span class="sourceLineNo">243</span> assertTrue(fs.exists(regionBdir));<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> HColumnDescriptor[] columnFamilies = tableDescriptor.getColumnFamilies();<a name="line.245"></a>
+<span class="sourceLineNo">246</span> HRegionFileSystem hrfs = new HRegionFileSystem(<a name="line.246"></a>
+<span class="sourceLineNo">247</span> TEST_UTIL.getConfiguration(), fs, tabledir, mergedRegionInfo);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> int count = 0;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> count += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span> ADMIN.compactRegion(mergedRegionInfo.getRegionName());<a name="line.252"></a>
+<span class="sourceLineNo">253</span> // clean up the merged region store files<a name="line.253"></a>
+<span class="sourceLineNo">254</span> // wait until merged region have reference file<a name="line.254"></a>
+<span class="sourceLineNo">255</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.255"></a>
+<span class="sourceLineNo">256</span> int newcount = 0;<a name="line.256"></a>
+<span class="sourceLineNo">257</span> while (System.currentTimeMillis() < timeout) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> newcount += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if(newcount > count) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> break;<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<a name="line.263"></a>
+<span class="sourceLineNo">264</span> Thread.sleep(50);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span> assertTrue(newcount > count);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> List<RegionServerThread> regionServerThreads = TEST_UTIL.getHBaseCluster()<a name="line.267"></a>
+<span class="sourceLineNo">268</span> .getRegionServerThreads();<a name="line.268"></a>
+<span class="sourceLineNo">269</span> for (RegionServerThread rs : regionServerThreads) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> CompactedHFilesDischarger cleaner = new CompactedHFilesDischarger(100, null,<a name="line.270"></a>
+<span class="sourceLineNo">271</span> rs.getRegionServer(), false);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> cleaner.chore();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> Thread.sleep(1000);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span> while (System.currentTimeMillis() < timeout) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> int newcount1 = 0;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> newcount1 += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span> if(newcount1 <= 1) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> break;<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> Thread.sleep(50);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> // run CatalogJanitor to clean merge references in hbase:meta and archive the<a name="line.285"></a>
+<span class="sourceLineNo">286</span> // files of merging regions<a name="line.286"></a>
+<span class="sourceLineNo">287</span> int cleaned = 0;<a name="line.287"></a>
+<span class="sourceLineNo">288</span> while (cleaned == 0) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> cleaned = ADMIN.runCatalogScan();<a name="line.289"></a>
+<span class="sourceLineNo">290</span> LOG.debug("catalog janitor returned " + cleaned);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> Thread.sleep(50);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span> assertFalse(regionAdir.toString(), fs.exists(regionAdir));<a name="line.293"></a>
+<span class="sourceLineNo">294</span> assertFalse(regionBdir.toString(), fs.exists(regionBdir));<a name="line.294"></a>
+<span class="sourceLineNo">295</span> assertTrue(cleaned > 0);<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span> mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.297"></a>
+<span class="sourceLineNo">298</span> TEST_UTIL.getConnection(), mergedRegionInfo.getRegionName());<a name="line.298"></a>
+<span class="sourceLineNo">299</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.299"></a>
+<span class="sourceLineNo">300</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.301"></a>
+<span class="sourceLineNo">302</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> } finally {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> ADMIN.enableCatalogJanitor(true);<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><a name="line.308"></a>
+<span class="sourceLineNo">309</span> /**<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * This test tests 1, merging region not online;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * 2, merging same two regions; 3, merging unknown regions.<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * They are in one test case so that we don't have to create<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * many tables, and these tests are simple.<a name="line.313"></a>
+<span class="sourceLineNo">314</span> */<a name="line.314"></a>
+<span class="sourceLineNo">315</span> @Test<a name="line.315"></a>
+<span class="sourceLineNo">316</span> public void testMerge() throws Exception {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> LOG.info("Starting testMerge");<a name="line.317"></a>
+<span class="sourceLineNo">318</span> final TableName tableName = TableName.valueOf("testMerge");<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> try {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> // Create table and load data.<a name="line.321"></a>
+<span class="sourceLineNo">322</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> RegionStates regionStates = MASTER.getAssignmentManager().getRegionStates();<a name="line.323"></a>
+<span class="sourceLineNo">324</span> List<HRegionInfo> regions = regionStates.getRegionsOfTable(tableName);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> // Fake offline one region<a name="line.325"></a>
+<span class="sourceLineNo">326</span> HRegionInfo a = regions.get(0);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> HRegionInfo b = regions.get(1);<a name="line.327"></a>
+<span class="sourceLineNo">328</span> regionStates.regionOffline(a);<a name="line.328"></a>
+<span class="sourceLineNo">329</span> try {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> // Merge offline region. Region a is offline here<a name="line.330"></a>
+<span class="sourceLineNo">331</span> ADMIN.mergeRegions(a.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), false);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> fail("Offline regions should not be able to merge");<a name="line.332"></a>
+<span class="sourceLineNo">333</span> } catch (IOException ie) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> System.out.println(ie);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> assertTrue("Exception should mention regions not online",<a name="line.335"></a>
+<span class="sourceLineNo">336</span> StringUtils.stringifyException(ie).contains("regions not online")<a name="line.336"></a>
+<span class="sourceLineNo">337</span> && ie instanceof MergeRegionException);<a name="line.337"></a>
+<span class="sourceLineNo">338</span> }<a name="line.338"></a>
+<span class="sourceLineNo">339</span> try {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // Merge the same region: b and b.<a name="line.340"></a>
+<span class="sourceLineNo">341</span> ADMIN.mergeRegions(b.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), true);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> fail("A region should not be able to merge with itself, even forcifully");<a name="line.342"></a>
+<span class="sourceLineNo">343</span> } catch (IOException ie) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> assertTrue("Exception should mention regions not online",<a name="line.344"></a>
+<span class="sourceLineNo">345</span> StringUtils.stringifyException(ie).contains("region to itself")<a name="line.345"></a>
+<span class="sourceLineNo">346</span> && ie instanceof MergeRegionException);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span> try {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> // Merge unknown regions<a name="line.349"></a>
+<span class="sourceLineNo">350</span> ADMIN.mergeRegions(Bytes.toBytes("-f1"), Bytes.toBytes("-f2"), true);<a name="line.350"></a>
+<span class="sourceLineNo">351</span> fail("Unknown region could not be merged");<a name="line.351"></a>
+<span class="sourceLineNo">352</span> } catch (IOException ie) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> assertTrue("UnknownRegionException should be thrown",<a name="line.353"></a>
+<span class="sourceLineNo">354</span> ie instanceof UnknownRegionException);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> table.close();<a name="line.356"></a>
+<span class="sourceLineNo">357</span> } finally {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> TEST_UTIL.deleteTable(tableName);<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span> @Test<a name="line.362"></a>
+<span class="sourceLineNo">363</span> public void testMergeWithReplicas() throws Exception {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> final TableName tableName = TableName.valueOf("testMergeWithReplicas");<a name="line.364"></a>
+<span class="sourceLineNo">365</span> // Create table and load data.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> createTableAndLoadData(MASTER, tableName, 5, 2);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> List<Pair<HRegionInfo, ServerName>> initialRegionToServers =<a name="line.367"></a>
+<span class="sourceLineNo">368</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.368"></a>
+<span class="sourceLineNo">369</span> TEST_UTIL.getConnection(), tableName);<a name="line.369"></a>
+<span class="sourceLineNo">370</span> // Merge 1st and 2nd region<a name="line.370"></a>
+<span class="sourceLineNo">371</span> PairOfSameType<HRegionInfo> mergedRegions = mergeRegionsAndVerifyRegionNum(MASTER, tableName,<a name="line.371"></a>
+<span class="sourceLineNo">372</span> 0, 2, 5 * 2 - 2);<a name="line.372"></a>
+<span class="sourceLineNo">373</span> List<Pair<HRegionInfo, ServerName>> currentRegionToServers =<a name="line.373"></a>
+<span class="sourceLineNo">374</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.374"></a>
+<span class="sourceLineNo">375</span> TEST_UTIL.getConnection(), tableName);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> List<HRegionInfo> initialRegions = new ArrayList<HRegionInfo>();<a name="line.376"></a>
+<span class="sourceLineNo">377</span> for (Pair<HRegionInfo, ServerName> p : initialRegionToServers) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span> initialRegions.add(p.getFirst());<a name="line.378"></a>
<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span> assertTrue(initialRegions.contains(mergedRegions.getFirst())); //this is the first region<a name="line.380"></a>
-<span class="sourceLineNo">381</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.381"></a>
-<span class="sourceLineNo">382</span> mergedRegions.getFirst(), 1))); //this is the replica of the first region<a name="line.382"></a>
-<span class="sourceLineNo">383</span> assertTrue(initialRegions.contains(mergedRegions.getSecond())); //this is the second region<a name="line.383"></a>
-<span class="sourceLineNo">384</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.384"></a>
-<span class="sourceLineNo">385</span> mergedRegions.getSecond(), 1))); //this is the replica of the second region<a name="line.385"></a>
-<span class="sourceLineNo">386</span> assertTrue(!initialRegions.contains(currentRegions.get(0))); //this is the new region<a name="line.386"></a>
-<span class="sourceLineNo">387</span> assertTrue(!initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.387"></a>
-<span class="sourceLineNo">388</span> currentRegions.get(0), 1))); //replica of the new region<a name="line.388"></a>
-<span class="sourceLineNo">389</span> assertTrue(currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.389"></a>
-<span class="sourceLineNo">390</span> currentRegions.get(0), 1))); //replica of the new region<a name="line.390"></a>
-<span class="sourceLineNo">391</span> assertTrue(!currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.391"></a>
-<span class="sourceLineNo">392</span> mergedRegions.getFirst(), 1))); //replica of the merged region<a name="line.392"></a>
-<span class="sourceLineNo">393</span> assertTrue(!currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.393"></a>
-<span class="sourceLineNo">394</span> mergedRegions.getSecond(), 1))); //replica of the merged region<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> private PairOfSameType<HRegionInfo> mergeRegionsAndVerifyRegionNum(<a name="line.397"></a>
-<span class="sourceLineNo">398</span> HMaster master, TableName tablename,<a name="line.398"></a>
-<span class="sourceLineNo">399</span> int regionAnum, int regionBnum, int expectedRegionNum) throws Exception {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> PairOfSameType<HRegionInfo> mergedRegions =<a name="line.400"></a>
-<span class="sourceLineNo">401</span> requestMergeRegion(master, tablename, regionAnum, regionBnum);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> waitAndVerifyRegionNum(master, tablename, expectedRegionNum);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> return mergedRegions;<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> private PairOfSameType<HRegionInfo> requestMergeRegion(<a name="line.406"></a>
-<span class="sourceLineNo">407</span> HMaster master, TableName tablename,<a name="line.407"></a>
-<span class="sourceLineNo">408</span> int regionAnum, int regionBnum) throws Exception {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor<a name="line.409"></a>
-<span class="sourceLineNo">410</span> .getTableRegionsAndLocations(<a name="line.410"></a>
-<span class="sourceLineNo">411</span> master.getConnection(), tablename);<a name="line.411"></a>
-<span class="sourceLineNo">412</span> HRegionInfo regionA = tableRegions.get(regionAnum).getFirst();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> HRegionInfo regionB = tableRegions.get(regionBnum).getFirst();<a name="line.413"></a>
-<span class="sourceLineNo">414</span> TEST_UTIL.getHBaseAdmin().mergeRegions(<a name="line.414"></a>
-<span class="sourceLineNo">415</span> regionA.getEncodedNameAsBytes(),<a name="line.415"></a>
-<span class="sourceLineNo">416</span> regionB.getEncodedNameAsBytes(), false);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return new PairOfSameType<HRegionInfo>(regionA, regionB);<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> private void waitAndVerifyRegionNum(HMaster master, TableName tablename,<a name="line.420"></a>
-<span class="sourceLineNo">421</span> int expectedRegionNum) throws Exception {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> List<Pair<HRegionInfo, ServerName>> tableRegionsInMeta;<a name="line.422"></a>
-<span class="sourceLineNo">423</span> List<HRegionInfo> tableRegionsInMaster;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> while (System.currentTimeMillis() < timeout) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> tableRegionsInMeta = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.426"></a>
-<span class="sourceLineNo">427</span> master.getConnection(), tablename);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> tableRegionsInMaster = master.getAssignmentManager().getRegionStates()<a name="line.428"></a>
-<span class="sourceLineNo">429</span> .getRegionsOfTable(tablename);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> if (tableRegionsInMeta.size() == expectedRegionNum<a name="line.430"></a>
-<span class="sourceLineNo">431</span> && tableRegionsInMaster.size() == expectedRegionNum) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> break;<a name="line.432"></a>
-<span class="sourceLineNo">433</span> }<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Thread.sleep(250);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> }<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span> tableRegionsInMeta = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.437"></a>
-<span class="sourceLineNo">438</span> master.getConnection(), tablename);<a name="line.438"></a>
-<span class="sourceLineNo">439</span> LOG.info("Regions after merge:" + Joiner.on(',').join(tableRegionsInMeta));<a name="line.439"></a>
-<span class="sourceLineNo">440</span> assertEquals(expectedRegionNum, tableRegionsInMeta.size());<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> private Table createTableAndLoadData(HMaster master, TableName tablename)<a name="line.443"></a>
-<span class="sourceLineNo">444</span> throws Exception {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> return createTableAndLoadData(master, tablename, INITIAL_REGION_NUM, 1);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span> private Table createTableAndLoadData(HMaster master, TableName tablename,<a name="line.448"></a>
-<span class="sourceLineNo">449</span> int numRegions, int replication) throws Exception {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> assertTrue("ROWSIZE must > numregions:" + numRegions, ROWSIZE > numRegions);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> byte[][] splitRows = new byte[numRegions - 1][];<a name="line.451"></a>
-<span class="sourceLineNo">452</span> for (int i = 0; i < splitRows.length; i++) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> splitRows[i] = ROWS[(i + 1) * ROWSIZE / numRegions];<a name="line.453"></a>
-<span class="sourceLineNo">454</span> }<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> Table table = TEST_UTIL.createTable(tablename, FAMILYNAME, splitRows);<a name="line.456"></a>
-<span class="sourceLineNo">457</span> if (replication > 1) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> HBaseTestingUtility.setReplicas(admin, tablename, replication);<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
-<span class="sourceLineNo">460</span> loadData(table);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> verifyRowCount(table, ROWSIZE);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> // sleep here is an ugly hack to allow region transitions to finish<a name="line.463"></a>
-<span class="sourceLineNo">464</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> List<Pair<HRegionInfo, ServerName>> tableRegions;<a name="line.465"></a>
-<span class="sourceLineNo">466</span> while (System.currentTimeMillis() < timeout) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> tableRegions = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.467"></a>
-<span class="sourceLineNo">468</span> master.getConnection(), tablename);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (tableRegions.size() == numRegions * replication)<a name="line.469"></a>
-<span class="sourceLineNo">470</span> break;<a name="line.470"></a>
-<span class="sourceLineNo">471</span> Thread.sleep(250);<a name="line.471"></a>
-<span class="sourceLineNo">472</span> }<a name="line.472"></a>
-<span class="sourceLineNo">473</span><a name="line.473"></a>
-<span class="sourceLineNo">474</span> tableRegions = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.474"></a>
-<span class="sourceLineNo">475</span> master.getConnection(), tablename);<a name="line.475"></a>
-<span class="sourceLineNo">476</span> LOG.info("Regions after load: " + Joiner.on(',').join(tableRegions));<a name="line.476"></a>
-<span class="sourceLineNo">477</span> assertEquals(numRegions * replication, tableRegions.size());<a name="line.477"></a>
-<span class="sourceLineNo">478</span> return table;<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span> private static byte[][] makeN(byte[] base, int n) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span> byte[][] ret = new byte[n][];<a name="line.482"></a>
-<span class="sourceLineNo">483</span> for (int i = 0; i < n; i++) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> ret[i] = Bytes.add(base, Bytes.toBytes(String.format("%04d", i)));<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span> return ret;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> }<a name="line.487"></a>
-<span class="sourceLineNo">488</span><a name="line.488"></a>
-<span class="sourceLineNo">489</span> private void loadData(Table table) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> for (int i = 0; i < ROWSIZE; i++) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> Put put = new Put(ROWS[i]);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> put.addColumn(FAMILYNAME, QUALIFIER, Bytes.toBytes(i));<a name="line.492"></a>
-<span class="sourceLineNo">493</span> table.put(put);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> }<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> private void verifyRowCount(Table table, int expectedRegionNum)<a name="line.497"></a>
-<span class="sourceLineNo">498</span> throws IOException {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> ResultScanner scanner = table.getScanner(new Scan());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> int rowCount = 0;<a name="line.500"></a>
-<span class="sourceLineNo">501</span> while (scanner.next() != null) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> rowCount++;<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span> assertEquals(expectedRegionNum, rowCount);<a name="line.504"></a>
-<span class="sourceLineNo">505</span> scanner.close();<a name="line.505"></a>
-<span class="sourceLineNo">506</span> }<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> // Make it public so that JVMClusterUtil can access it.<a name="line.508"></a>
-<span class="sourceLineNo">509</span> public static class MyMaster extends HMaster {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> public MyMaster(Configuration conf, CoordinatedStateManager cp)<a name="line.510"></a>
-<span class="sourceLineNo">511</span> throws IOException, KeeperException,<a name="line.511"></a>
-<span class="sourceLineNo">512</span> InterruptedException {<a name="line.512"></a>
-<span class="sourceLineNo">513</span> super(conf, cp);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> @Override<a name="line.516"></a>
-<span class="sourceLineNo">517</span> protected RSRpcServices createRpcServices() throws IOException {<a name="line.517"></a>
-<span class="sourceLineNo">518</span> return new MyMasterRpcServices(this);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
-<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span> static class MyMasterRpcServices extends MasterRpcServices {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> static AtomicBoolean enabled = new AtomicBoolean(false);<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> private HMaster myMaster;<a name="line.525"></a>
-<span class="sourceLineNo">526</span> public MyMasterRpcServices(HMaster master) throws IOException {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> super(master);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> myMaster = master;<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span> @Override<a name="line.531"></a>
-<span class="sourceLineNo">532</span> public ReportRegionStateTransitionResponse reportRegionStateTransition(RpcController c,<a name="line.532"></a>
-<span class="sourceLineNo">533</span> ReportRegionStateTransitionRequest req) throws ServiceException {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> ReportRegionStateTransitionResponse resp = super.reportRegionStateTransition(c, req);<a name="line.534"></a>
-<span class="sourceLineNo">535</span> if (enabled.get() && req.getTransition(0).getTransitionCode()<a name="line.535"></a>
-<span class="sourceLineNo">536</span> == TransitionCode.READY_TO_MERGE && !resp.hasErrorMessage()) {<a name="line.536"></a>
-<span class="sourceLineNo">537</span> RegionStates regionStates = myMaster.getAssignmentManager().getRegionStates();<a name="line.537"></a>
-<span class="sourceLineNo">538</span> for (RegionState regionState: regionStates.getRegionsInTransition().values()) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span> // Find the merging_new region and remove it<a name="line.539"></a>
-<span class="sourceLineNo">540</span> if (regionState.isMergingNew()) {<a name="line.540"></a>
-<span class="sourceLineNo">541</span> regionStates.deleteRegion(regionState.getRegion());<a name="line.541"></a>
-<span class="sourceLineNo">542</span> }<a name="line.542"></a>
-<span class="sourceLineNo">543</span> }<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span> return resp;<a name="line.545"></a>
-<span class="sourceLineNo">546</span> }<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>}<a name="line.548"></a>
+<span class="sourceLineNo">380</span> List<HRegionInfo> currentRegions = new ArrayList<HRegionInfo>();<a name="line.380"></a>
+<span class="sourceLineNo">381</span> for (Pair<HRegionInfo, ServerName> p : currentRegionToServers) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> currentRegions.add(p.getFirst());<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span> assertTrue(initialRegions.contains(mergedRegions.getFirst())); //this is the first region<a name="line.384"></a>
+<span class="sourceLineNo">385</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.385"></a>
+<span class="sourceLineNo">386</span> mergedRegions.getFirst(), 1))); //this is the replica of the first region<a name="line.386"></a>
+<span class="sourceLineNo">387</span> assertTrue(initialRegions.contains(mergedRegions.getSecond())); //this is the second region<a name="line.387"></a>
+<span class="sourceLineNo">388</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.388"></a>
+<span class="sourceLineNo">389</span> mergedRegions.getSecond(), 1))); //this is the replica of the second region<a name="line.389"></a>
+<span class="sourceLineNo">390</span> assertTrue(!initialR
<TRUNCATED>
[03/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
index 63a0449..3cade5d 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
@@ -19,223 +19,236 @@
<a class="jxr_linenumber" name="9" href="#9">9</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.monitoring.*;
<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_comment">// 22, 1</em>
<a class="jxr_linenumber" name="11" href="#11">11</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.util.StringUtils;
-<a class="jxr_linenumber" name="12" href="#12">12</a>
-<a class="jxr_linenumber" name="13" href="#13">13</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html">TaskMonitorTmplImpl</a>
-<a class="jxr_linenumber" name="14" href="#14">14</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateImpl
-<a class="jxr_linenumber" name="15" href="#15">15</a> <strong class="jxr_keyword">implements</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.Intf
+<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="13" href="#13">13</a> <strong class="jxr_keyword">import</strong> org.owasp.esapi.ESAPI;
+<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="15" href="#15">15</a> <strong class="jxr_keyword">import</strong> org.owasp.esapi.errors.EncodingException;
<a class="jxr_linenumber" name="16" href="#16">16</a>
-<a class="jxr_linenumber" name="17" href="#17">17</a> {
-<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor;
-<a class="jxr_linenumber" name="19" href="#19">19</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
-<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.ImplData p_implData)
-<a class="jxr_linenumber" name="22" href="#22">22</a> {
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">if</strong>(! p_implData.getTaskMonitor__IsNotDefault())
-<a class="jxr_linenumber" name="24" href="#24">24</a> {
-<a class="jxr_linenumber" name="25" href="#25">25</a> p_implData.setTaskMonitor(TaskMonitor.get());
-<a class="jxr_linenumber" name="26" href="#26">26</a> }
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
-<a class="jxr_linenumber" name="28" href="#28">28</a> {
-<a class="jxr_linenumber" name="29" href="#29">29</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
-<a class="jxr_linenumber" name="30" href="#30">30</a> }
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
-<a class="jxr_linenumber" name="32" href="#32">32</a> {
-<a class="jxr_linenumber" name="33" href="#33">33</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
-<a class="jxr_linenumber" name="34" href="#34">34</a> }
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">return</strong> p_implData;
-<a class="jxr_linenumber" name="36" href="#36">36</a> }
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html">TaskMonitorTmplImpl</a>(org.jamon.TemplateManager p_templateManager, org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.ImplData p_implData)
-<a class="jxr_linenumber" name="38" href="#38">38</a> {
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">super</strong>(p_templateManager, __jamon_setOptionalArguments(p_implData));
-<a class="jxr_linenumber" name="40" href="#40">40</a> taskMonitor = p_implData.getTaskMonitor();
-<a class="jxr_linenumber" name="41" href="#41">41</a> filter = p_implData.getFilter();
-<a class="jxr_linenumber" name="42" href="#42">42</a> format = p_implData.getFormat();
-<a class="jxr_linenumber" name="43" href="#43">43</a> }
-<a class="jxr_linenumber" name="44" href="#44">44</a>
-<a class="jxr_linenumber" name="45" href="#45">45</a> @Override <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">throws</strong> java.io.IOException
-<a class="jxr_linenumber" name="47" href="#47">47</a> {
-<a class="jxr_linenumber" name="48" href="#48">48</a> <em class="jxr_comment">// 29, 1</em>
-<a class="jxr_linenumber" name="49" href="#49">49</a>
-<a class="jxr_linenumber" name="50" href="#50">50</a> List<? <strong class="jxr_keyword">extends</strong> MonitoredTask> tasks = taskMonitor.getTasks();
-<a class="jxr_linenumber" name="51" href="#51">51</a> Iterator<? <strong class="jxr_keyword">extends</strong> MonitoredTask> iter = tasks.iterator();
-<a class="jxr_linenumber" name="52" href="#52">52</a> <em class="jxr_comment">// apply requested filter</em>
-<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">while</strong> (iter.hasNext()) {
-<a class="jxr_linenumber" name="54" href="#54">54</a> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html">MonitoredTask</a> t = iter.next();
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"general"</span>)) {
-<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">if</strong> (t instanceof MonitoredRPCHandler)
-<a class="jxr_linenumber" name="57" href="#57">57</a> iter.remove();
-<a class="jxr_linenumber" name="58" href="#58">58</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"handler"</span>)) {
-<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">if</strong> (!(t instanceof MonitoredRPCHandler))
-<a class="jxr_linenumber" name="60" href="#60">60</a> iter.remove();
-<a class="jxr_linenumber" name="61" href="#61">61</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"rpc"</span>)) {
-<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">if</strong> (!(t instanceof MonitoredRPCHandler) ||
-<a class="jxr_linenumber" name="63" href="#63">63</a> !((MonitoredRPCHandler) t).isRPCRunning())
-<a class="jxr_linenumber" name="64" href="#64">64</a> iter.remove();
-<a class="jxr_linenumber" name="65" href="#65">65</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"operation"</span>)) {
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">if</strong> (!(t instanceof MonitoredRPCHandler) ||
-<a class="jxr_linenumber" name="67" href="#67">67</a> !((MonitoredRPCHandler) t).isOperationRunning())
-<a class="jxr_linenumber" name="68" href="#68">68</a> iter.remove();
-<a class="jxr_linenumber" name="69" href="#69">69</a> }
-<a class="jxr_linenumber" name="70" href="#70">70</a> }
-<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">long</strong> now = System.currentTimeMillis();
-<a class="jxr_linenumber" name="72" href="#72">72</a> Collections.reverse(tasks);
-<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">boolean</strong> first = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="74" href="#74">74</a>
-<a class="jxr_linenumber" name="75" href="#75">75</a> <em class="jxr_comment">// 55, 1</em>
-<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">if</strong> (format.equals(<span class="jxr_string">"json"</span>))
-<a class="jxr_linenumber" name="77" href="#77">77</a> {
-<a class="jxr_linenumber" name="78" href="#78">78</a> <em class="jxr_comment">// 55, 29</em>
-<a class="jxr_linenumber" name="79" href="#79">79</a> jamonWriter.write(<span class="jxr_string">"\n["</span>);
-<a class="jxr_linenumber" name="80" href="#80">80</a> <em class="jxr_comment">// 56, 2</em>
-<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">for</strong> (MonitoredTask task : tasks)
-<a class="jxr_linenumber" name="82" href="#82">82</a> {
-<a class="jxr_linenumber" name="83" href="#83">83</a> <em class="jxr_comment">// 56, 36</em>
-<a class="jxr_linenumber" name="84" href="#84">84</a> <strong class="jxr_keyword">if</strong> (first)
-<a class="jxr_linenumber" name="85" href="#85">85</a> {
-<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_comment">// 56, 48</em>
-<a class="jxr_linenumber" name="87" href="#87">87</a> first = false;
-<a class="jxr_linenumber" name="88" href="#88">88</a> }
-<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// 56, 77</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="91" href="#91">91</a> {
-<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_comment">// 56, 84</em>
-<a class="jxr_linenumber" name="93" href="#93">93</a> jamonWriter.write(<span class="jxr_string">","</span>);
-<a class="jxr_linenumber" name="94" href="#94">94</a> }
-<a class="jxr_linenumber" name="95" href="#95">95</a> <em class="jxr_comment">// 56, 91</em>
-<a class="jxr_linenumber" name="96" href="#96">96</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(task.toJSON()), jamonWriter);
-<a class="jxr_linenumber" name="97" href="#97">97</a> }
-<a class="jxr_linenumber" name="98" href="#98">98</a> <em class="jxr_comment">// 56, 117</em>
-<a class="jxr_linenumber" name="99" href="#99">99</a> jamonWriter.write(<span class="jxr_string">"]\n"</span>);
-<a class="jxr_linenumber" name="100" href="#100">100</a> }
-<a class="jxr_linenumber" name="101" href="#101">101</a> <em class="jxr_comment">// 57, 1</em>
-<a class="jxr_linenumber" name="102" href="#102">102</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="103" href="#103">103</a> {
-<a class="jxr_linenumber" name="104" href="#104">104</a> <em class="jxr_comment">// 57, 8</em>
-<a class="jxr_linenumber" name="105" href="#105">105</a> jamonWriter.write(<span class="jxr_string">"\n<h2>Tasks</h2>\n <ul class=\"nav nav-pills\">\n <li "</span>);
-<a class="jxr_linenumber" name="106" href="#106">106</a> <em class="jxr_comment">// 60, 9</em>
-<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"all"</span>))
-<a class="jxr_linenumber" name="108" href="#108">108</a> {
-<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_comment">// 60, 36</em>
-<a class="jxr_linenumber" name="110" href="#110">110</a> jamonWriter.write(<span class="jxr_string">"class=\"active\""</span>);
-<a class="jxr_linenumber" name="111" href="#111">111</a> }
-<a class="jxr_linenumber" name="112" href="#112">112</a> <em class="jxr_comment">// 60, 56</em>
-<a class="jxr_linenumber" name="113" href="#113">113</a> jamonWriter.write(<span class="jxr_string">"><a href=\"?filter=all\">Show All Monitored Tasks</a></li>\n <li "</span>);
-<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_comment">// 61, 9</em>
-<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"general"</span>))
-<a class="jxr_linenumber" name="116" href="#116">116</a> {
-<a class="jxr_linenumber" name="117" href="#117">117</a> <em class="jxr_comment">// 61, 40</em>
-<a class="jxr_linenumber" name="118" href="#118">118</a> jamonWriter.write(<span class="jxr_string">"class=\"active\""</span>);
-<a class="jxr_linenumber" name="119" href="#119">119</a> }
-<a class="jxr_linenumber" name="120" href="#120">120</a> <em class="jxr_comment">// 61, 60</em>
-<a class="jxr_linenumber" name="121" href="#121">121</a> jamonWriter.write(<span class="jxr_string">"><a href=\"?filter=general\">Show non-RPC Tasks</a></li>\n <li "</span>);
-<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_comment">// 62, 9</em>
-<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"handler"</span>))
-<a class="jxr_linenumber" name="124" href="#124">124</a> {
-<a class="jxr_linenumber" name="125" href="#125">125</a> <em class="jxr_comment">// 62, 40</em>
-<a class="jxr_linenumber" name="126" href="#126">126</a> jamonWriter.write(<span class="jxr_string">"class=\"active\""</span>);
-<a class="jxr_linenumber" name="127" href="#127">127</a> }
-<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_comment">// 62, 60</em>
-<a class="jxr_linenumber" name="129" href="#129">129</a> jamonWriter.write(<span class="jxr_string">"><a href=\"?filter=handler\">Show All RPC Handler Tasks</a></li>\n <li "</span>);
-<a class="jxr_linenumber" name="130" href="#130">130</a> <em class="jxr_comment">// 63, 9</em>
-<a class="jxr_linenumber" name="131" href="#131">131</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"rpc"</span>))
-<a class="jxr_linenumber" name="132" href="#132">132</a> {
-<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_comment">// 63, 36</em>
-<a class="jxr_linenumber" name="134" href="#134">134</a> jamonWriter.write(<span class="jxr_string">"class=\"active\""</span>);
-<a class="jxr_linenumber" name="135" href="#135">135</a> }
-<a class="jxr_linenumber" name="136" href="#136">136</a> <em class="jxr_comment">// 63, 56</em>
-<a class="jxr_linenumber" name="137" href="#137">137</a> jamonWriter.write(<span class="jxr_string">"><a href=\"?filter=rpc\">Show Active RPC Calls</a></li>\n <li "</span>);
-<a class="jxr_linenumber" name="138" href="#138">138</a> <em class="jxr_comment">// 64, 9</em>
-<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"operation"</span>))
-<a class="jxr_linenumber" name="140" href="#140">140</a> {
-<a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_comment">// 64, 42</em>
-<a class="jxr_linenumber" name="142" href="#142">142</a> jamonWriter.write(<span class="jxr_string">"class=\"active\""</span>);
-<a class="jxr_linenumber" name="143" href="#143">143</a> }
-<a class="jxr_linenumber" name="144" href="#144">144</a> <em class="jxr_comment">// 64, 62</em>
-<a class="jxr_linenumber" name="145" href="#145">145</a> jamonWriter.write(<span class="jxr_string">"><a href=\"?filter=operation\">Show Client Operations</a></li>\n <li><a href=\"?format=json&filter="</span>);
-<a class="jxr_linenumber" name="146" href="#146">146</a> <em class="jxr_comment">// 65, 38</em>
-<a class="jxr_linenumber" name="147" href="#147">147</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(filter), jamonWriter);
-<a class="jxr_linenumber" name="148" href="#148">148</a> <em class="jxr_comment">// 65, 50</em>
-<a class="jxr_linenumber" name="149" href="#149">149</a> jamonWriter.write(<span class="jxr_string">"\">View as JSON</a></li>\n </ul>\n "</span>);
-<a class="jxr_linenumber" name="150" href="#150">150</a> <em class="jxr_comment">// 67, 3</em>
-<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">if</strong> (tasks.isEmpty())
-<a class="jxr_linenumber" name="152" href="#152">152</a> {
-<a class="jxr_linenumber" name="153" href="#153">153</a> <em class="jxr_comment">// 67, 25</em>
-<a class="jxr_linenumber" name="154" href="#154">154</a> jamonWriter.write(<span class="jxr_string">"\n <p>No tasks currently running on this node.</p>\n "</span>);
-<a class="jxr_linenumber" name="155" href="#155">155</a> }
-<a class="jxr_linenumber" name="156" href="#156">156</a> <em class="jxr_comment">// 69, 3</em>
-<a class="jxr_linenumber" name="157" href="#157">157</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="158" href="#158">158</a> {
-<a class="jxr_linenumber" name="159" href="#159">159</a> <em class="jxr_comment">// 69, 10</em>
-<a class="jxr_linenumber" name="160" href="#160">160</a> jamonWriter.write(<span class="jxr_string">"\n <table class=\"table\">\n <tr>\n <th>Start Time</th>\n <th>Description</th>\n <th>State</th>\n <th>Status</th>\n </tr>\n "</span>);
-<a class="jxr_linenumber" name="161" href="#161">161</a> <em class="jxr_comment">// 77, 5</em>
-<a class="jxr_linenumber" name="162" href="#162">162</a> <strong class="jxr_keyword">for</strong> (MonitoredTask task : tasks )
-<a class="jxr_linenumber" name="163" href="#163">163</a> {
-<a class="jxr_linenumber" name="164" href="#164">164</a> <em class="jxr_comment">// 77, 40</em>
-<a class="jxr_linenumber" name="165" href="#165">165</a> jamonWriter.write(<span class="jxr_string">"\n <tr class=\""</span>);
-<a class="jxr_linenumber" name="166" href="#166">166</a> <em class="jxr_comment">// 78, 16</em>
-<a class="jxr_linenumber" name="167" href="#167">167</a> {
-<a class="jxr_linenumber" name="168" href="#168">168</a> <em class="jxr_comment">// 78, 16</em>
-<a class="jxr_linenumber" name="169" href="#169">169</a> __jamon_innerUnit__stateCss(jamonWriter, task.getState() );
-<a class="jxr_linenumber" name="170" href="#170">170</a> }
-<a class="jxr_linenumber" name="171" href="#171">171</a> <em class="jxr_comment">// 78, 55</em>
-<a class="jxr_linenumber" name="172" href="#172">172</a> jamonWriter.write(<span class="jxr_string">"\">\n <td>"</span>);
-<a class="jxr_linenumber" name="173" href="#173">173</a> <em class="jxr_comment">// 79, 11</em>
-<a class="jxr_linenumber" name="174" href="#174">174</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(<strong class="jxr_keyword">new</strong> Date(task.getStartTime())), jamonWriter);
-<a class="jxr_linenumber" name="175" href="#175">175</a> <em class="jxr_comment">// 79, 46</em>
-<a class="jxr_linenumber" name="176" href="#176">176</a> jamonWriter.write(<span class="jxr_string">"</td>\n <td>"</span>);
-<a class="jxr_linenumber" name="177" href="#177">177</a> <em class="jxr_comment">// 80, 11</em>
-<a class="jxr_linenumber" name="178" href="#178">178</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(task.getDescription()), jamonWriter);
-<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_comment">// 80, 38</em>
-<a class="jxr_linenumber" name="180" href="#180">180</a> jamonWriter.write(<span class="jxr_string">"</td>\n <td>"</span>);
-<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_comment">// 81, 11</em>
-<a class="jxr_linenumber" name="182" href="#182">182</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(task.getState()), jamonWriter);
-<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_comment">// 81, 32</em>
-<a class="jxr_linenumber" name="184" href="#184">184</a> jamonWriter.write(<span class="jxr_string">"\n (since "</span>);
-<a class="jxr_linenumber" name="185" href="#185">185</a> <em class="jxr_comment">// 82, 18</em>
-<a class="jxr_linenumber" name="186" href="#186">186</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(StringUtils.formatTimeDiff(now, task.getStateTime())), jamonWriter);
-<a class="jxr_linenumber" name="187" href="#187">187</a> <em class="jxr_comment">// 82, 76</em>
-<a class="jxr_linenumber" name="188" href="#188">188</a> jamonWriter.write(<span class="jxr_string">" ago)\n </td>\n <td>"</span>);
-<a class="jxr_linenumber" name="189" href="#189">189</a> <em class="jxr_comment">// 84, 11</em>
-<a class="jxr_linenumber" name="190" href="#190">190</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(task.getStatus()), jamonWriter);
-<a class="jxr_linenumber" name="191" href="#191">191</a> <em class="jxr_comment">// 84, 33</em>
-<a class="jxr_linenumber" name="192" href="#192">192</a> jamonWriter.write(<span class="jxr_string">"\n (since "</span>);
-<a class="jxr_linenumber" name="193" href="#193">193</a> <em class="jxr_comment">// 85, 18</em>
-<a class="jxr_linenumber" name="194" href="#194">194</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(StringUtils.formatTimeDiff(now, task.getStatusTime())), jamonWriter);
-<a class="jxr_linenumber" name="195" href="#195">195</a> <em class="jxr_comment">// 85, 77</em>
-<a class="jxr_linenumber" name="196" href="#196">196</a> jamonWriter.write(<span class="jxr_string">" \n ago)</td>\n </tr>\n "</span>);
-<a class="jxr_linenumber" name="197" href="#197">197</a> }
-<a class="jxr_linenumber" name="198" href="#198">198</a> <em class="jxr_comment">// 88, 12</em>
-<a class="jxr_linenumber" name="199" href="#199">199</a> jamonWriter.write(<span class="jxr_string">"\n </table>\n\n "</span>);
-<a class="jxr_linenumber" name="200" href="#200">200</a> }
-<a class="jxr_linenumber" name="201" href="#201">201</a> <em class="jxr_comment">// 91, 9</em>
-<a class="jxr_linenumber" name="202" href="#202">202</a> jamonWriter.write(<span class="jxr_string">"\n"</span>);
-<a class="jxr_linenumber" name="203" href="#203">203</a> }
-<a class="jxr_linenumber" name="204" href="#204">204</a> <em class="jxr_comment">// 92, 7</em>
-<a class="jxr_linenumber" name="205" href="#205">205</a> jamonWriter.write(<span class="jxr_string">"\n\n\n"</span>);
-<a class="jxr_linenumber" name="206" href="#206">206</a> }
-<a class="jxr_linenumber" name="207" href="#207">207</a>
-<a class="jxr_linenumber" name="208" href="#208">208</a>
-<a class="jxr_linenumber" name="209" href="#209">209</a> <em class="jxr_comment">// 95, 1</em>
-<a class="jxr_linenumber" name="210" href="#210">210</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> __jamon_innerUnit__stateCss(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter, <strong class="jxr_keyword">final</strong> MonitoredTask.State state)
-<a class="jxr_linenumber" name="211" href="#211">211</a> <strong class="jxr_keyword">throws</strong> java.io.IOException
-<a class="jxr_linenumber" name="212" href="#212">212</a> {
-<a class="jxr_linenumber" name="213" href="#213">213</a> <em class="jxr_comment">// 99, 1</em>
-<a class="jxr_linenumber" name="214" href="#214">214</a> <strong class="jxr_keyword">if</strong> (state == MonitoredTask.State.COMPLETE) {
-<a class="jxr_linenumber" name="215" href="#215">215</a> <em class="jxr_comment">// 99, 68</em>
-<a class="jxr_linenumber" name="216" href="#216">216</a> jamonWriter.write(<span class="jxr_string">"alert alert-success"</span>);
-<a class="jxr_linenumber" name="217" href="#217">217</a> <em class="jxr_comment">// 99, 87</em>
-<a class="jxr_linenumber" name="218" href="#218">218</a> }
-<a class="jxr_linenumber" name="219" href="#219">219</a> <em class="jxr_comment">// 100, 1</em>
-<a class="jxr_linenumber" name="220" href="#220">220</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (state == MonitoredTask.State.ABORTED) {
-<a class="jxr_linenumber" name="221" href="#221">221</a> <em class="jxr_comment">// 100, 68</em>
-<a class="jxr_linenumber" name="222" href="#222">222</a> jamonWriter.write(<span class="jxr_string">"alert alert-error"</span>);
-<a class="jxr_linenumber" name="223" href="#223">223</a> <em class="jxr_comment">// 100, 85</em>
-<a class="jxr_linenumber" name="224" href="#224">224</a> }
-<a class="jxr_linenumber" name="225" href="#225">225</a> }
-<a class="jxr_linenumber" name="226" href="#226">226</a>
-<a class="jxr_linenumber" name="227" href="#227">227</a>
-<a class="jxr_linenumber" name="228" href="#228">228</a> }
+<a class="jxr_linenumber" name="17" href="#17">17</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html">TaskMonitorTmplImpl</a>
+<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateImpl
+<a class="jxr_linenumber" name="19" href="#19">19</a> <strong class="jxr_keyword">implements</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.Intf
+<a class="jxr_linenumber" name="20" href="#20">20</a>
+<a class="jxr_linenumber" name="21" href="#21">21</a> {
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <em class="jxr_comment">// 31, 1</em>
+<a class="jxr_linenumber" name="26" href="#26">26</a>
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">public</strong> String encodeFilter() {
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">return</strong> ESAPI.encoder().encodeForURL(filter);
+<a class="jxr_linenumber" name="30" href="#30">30</a> }<strong class="jxr_keyword">catch</strong>(EncodingException e) {}
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">return</strong> ESAPI.encoder().encodeForHTML(filter);
+<a class="jxr_linenumber" name="32" href="#32">32</a> }
+<a class="jxr_linenumber" name="33" href="#33">33</a>
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.ImplData p_implData)
+<a class="jxr_linenumber" name="35" href="#35">35</a> {
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
+<a class="jxr_linenumber" name="37" href="#37">37</a> {
+<a class="jxr_linenumber" name="38" href="#38">38</a> p_implData.setFormat(<span class="jxr_string">"html"</span>);
+<a class="jxr_linenumber" name="39" href="#39">39</a> }
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">if</strong>(! p_implData.getTaskMonitor__IsNotDefault())
+<a class="jxr_linenumber" name="41" href="#41">41</a> {
+<a class="jxr_linenumber" name="42" href="#42">42</a> p_implData.setTaskMonitor(TaskMonitor.get());
+<a class="jxr_linenumber" name="43" href="#43">43</a> }
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
+<a class="jxr_linenumber" name="45" href="#45">45</a> {
+<a class="jxr_linenumber" name="46" href="#46">46</a> p_implData.setFilter(<span class="jxr_string">"general"</span>);
+<a class="jxr_linenumber" name="47" href="#47">47</a> }
+<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">return</strong> p_implData;
+<a class="jxr_linenumber" name="49" href="#49">49</a> }
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html">TaskMonitorTmplImpl</a>(org.jamon.TemplateManager p_templateManager, org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.ImplData p_implData)
+<a class="jxr_linenumber" name="51" href="#51">51</a> {
+<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">super</strong>(p_templateManager, __jamon_setOptionalArguments(p_implData));
+<a class="jxr_linenumber" name="53" href="#53">53</a> format = p_implData.getFormat();
+<a class="jxr_linenumber" name="54" href="#54">54</a> taskMonitor = p_implData.getTaskMonitor();
+<a class="jxr_linenumber" name="55" href="#55">55</a> filter = p_implData.getFilter();
+<a class="jxr_linenumber" name="56" href="#56">56</a> }
+<a class="jxr_linenumber" name="57" href="#57">57</a>
+<a class="jxr_linenumber" name="58" href="#58">58</a> @Override <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
+<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">throws</strong> java.io.IOException
+<a class="jxr_linenumber" name="60" href="#60">60</a> {
+<a class="jxr_linenumber" name="61" href="#61">61</a> <em class="jxr_comment">// 39, 1</em>
+<a class="jxr_linenumber" name="62" href="#62">62</a>
+<a class="jxr_linenumber" name="63" href="#63">63</a> List<? <strong class="jxr_keyword">extends</strong> MonitoredTask> tasks = taskMonitor.getTasks();
+<a class="jxr_linenumber" name="64" href="#64">64</a> Iterator<? <strong class="jxr_keyword">extends</strong> MonitoredTask> iter = tasks.iterator();
+<a class="jxr_linenumber" name="65" href="#65">65</a> <em class="jxr_comment">// apply requested filter</em>
+<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">while</strong> (iter.hasNext()) {
+<a class="jxr_linenumber" name="67" href="#67">67</a> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html">MonitoredTask</a> t = iter.next();
+<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"general"</span>)) {
+<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">if</strong> (t instanceof MonitoredRPCHandler)
+<a class="jxr_linenumber" name="70" href="#70">70</a> iter.remove();
+<a class="jxr_linenumber" name="71" href="#71">71</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"handler"</span>)) {
+<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">if</strong> (!(t instanceof MonitoredRPCHandler))
+<a class="jxr_linenumber" name="73" href="#73">73</a> iter.remove();
+<a class="jxr_linenumber" name="74" href="#74">74</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"rpc"</span>)) {
+<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">if</strong> (!(t instanceof MonitoredRPCHandler) ||
+<a class="jxr_linenumber" name="76" href="#76">76</a> !((MonitoredRPCHandler) t).isRPCRunning())
+<a class="jxr_linenumber" name="77" href="#77">77</a> iter.remove();
+<a class="jxr_linenumber" name="78" href="#78">78</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"operation"</span>)) {
+<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">if</strong> (!(t instanceof MonitoredRPCHandler) ||
+<a class="jxr_linenumber" name="80" href="#80">80</a> !((MonitoredRPCHandler) t).isOperationRunning())
+<a class="jxr_linenumber" name="81" href="#81">81</a> iter.remove();
+<a class="jxr_linenumber" name="82" href="#82">82</a> }
+<a class="jxr_linenumber" name="83" href="#83">83</a> }
+<a class="jxr_linenumber" name="84" href="#84">84</a> <strong class="jxr_keyword">long</strong> now = System.currentTimeMillis();
+<a class="jxr_linenumber" name="85" href="#85">85</a> Collections.reverse(tasks);
+<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">boolean</strong> first = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="87" href="#87">87</a>
+<a class="jxr_linenumber" name="88" href="#88">88</a> <em class="jxr_comment">// 65, 1</em>
+<a class="jxr_linenumber" name="89" href="#89">89</a> <strong class="jxr_keyword">if</strong> (format.equals(<span class="jxr_string">"json"</span>))
+<a class="jxr_linenumber" name="90" href="#90">90</a> {
+<a class="jxr_linenumber" name="91" href="#91">91</a> <em class="jxr_comment">// 65, 29</em>
+<a class="jxr_linenumber" name="92" href="#92">92</a> jamonWriter.write(<span class="jxr_string">"\n["</span>);
+<a class="jxr_linenumber" name="93" href="#93">93</a> <em class="jxr_comment">// 66, 2</em>
+<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">for</strong> (MonitoredTask task : tasks)
+<a class="jxr_linenumber" name="95" href="#95">95</a> {
+<a class="jxr_linenumber" name="96" href="#96">96</a> <em class="jxr_comment">// 66, 36</em>
+<a class="jxr_linenumber" name="97" href="#97">97</a> <strong class="jxr_keyword">if</strong> (first)
+<a class="jxr_linenumber" name="98" href="#98">98</a> {
+<a class="jxr_linenumber" name="99" href="#99">99</a> <em class="jxr_comment">// 66, 48</em>
+<a class="jxr_linenumber" name="100" href="#100">100</a> first = false;
+<a class="jxr_linenumber" name="101" href="#101">101</a> }
+<a class="jxr_linenumber" name="102" href="#102">102</a> <em class="jxr_comment">// 66, 77</em>
+<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="104" href="#104">104</a> {
+<a class="jxr_linenumber" name="105" href="#105">105</a> <em class="jxr_comment">// 66, 84</em>
+<a class="jxr_linenumber" name="106" href="#106">106</a> jamonWriter.write(<span class="jxr_string">","</span>);
+<a class="jxr_linenumber" name="107" href="#107">107</a> }
+<a class="jxr_linenumber" name="108" href="#108">108</a> <em class="jxr_comment">// 66, 91</em>
+<a class="jxr_linenumber" name="109" href="#109">109</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(task.toJSON()), jamonWriter);
+<a class="jxr_linenumber" name="110" href="#110">110</a> }
+<a class="jxr_linenumber" name="111" href="#111">111</a> <em class="jxr_comment">// 66, 117</em>
+<a class="jxr_linenumber" name="112" href="#112">112</a> jamonWriter.write(<span class="jxr_string">"]\n"</span>);
+<a class="jxr_linenumber" name="113" href="#113">113</a> }
+<a class="jxr_linenumber" name="114" href="#114">114</a> <em class="jxr_comment">// 67, 1</em>
+<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="116" href="#116">116</a> {
+<a class="jxr_linenumber" name="117" href="#117">117</a> <em class="jxr_comment">// 67, 8</em>
+<a class="jxr_linenumber" name="118" href="#118">118</a> jamonWriter.write(<span class="jxr_string">"\n<h2>Tasks</h2>\n <ul class=\"nav nav-pills\">\n <li "</span>);
+<a class="jxr_linenumber" name="119" href="#119">119</a> <em class="jxr_comment">// 70, 9</em>
+<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"all"</span>))
+<a class="jxr_linenumber" name="121" href="#121">121</a> {
+<a class="jxr_linenumber" name="122" href="#122">122</a> <em class="jxr_comment">// 70, 36</em>
+<a class="jxr_linenumber" name="123" href="#123">123</a> jamonWriter.write(<span class="jxr_string">"class=\"active\""</span>);
+<a class="jxr_linenumber" name="124" href="#124">124</a> }
+<a class="jxr_linenumber" name="125" href="#125">125</a> <em class="jxr_comment">// 70, 56</em>
+<a class="jxr_linenumber" name="126" href="#126">126</a> jamonWriter.write(<span class="jxr_string">"><a href=\"?filter=all\">Show All Monitored Tasks</a></li>\n <li "</span>);
+<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_comment">// 71, 9</em>
+<a class="jxr_linenumber" name="128" href="#128">128</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"general"</span>))
+<a class="jxr_linenumber" name="129" href="#129">129</a> {
+<a class="jxr_linenumber" name="130" href="#130">130</a> <em class="jxr_comment">// 71, 40</em>
+<a class="jxr_linenumber" name="131" href="#131">131</a> jamonWriter.write(<span class="jxr_string">"class=\"active\""</span>);
+<a class="jxr_linenumber" name="132" href="#132">132</a> }
+<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_comment">// 71, 60</em>
+<a class="jxr_linenumber" name="134" href="#134">134</a> jamonWriter.write(<span class="jxr_string">"><a href=\"?filter=general\">Show non-RPC Tasks</a></li>\n <li "</span>);
+<a class="jxr_linenumber" name="135" href="#135">135</a> <em class="jxr_comment">// 72, 9</em>
+<a class="jxr_linenumber" name="136" href="#136">136</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"handler"</span>))
+<a class="jxr_linenumber" name="137" href="#137">137</a> {
+<a class="jxr_linenumber" name="138" href="#138">138</a> <em class="jxr_comment">// 72, 40</em>
+<a class="jxr_linenumber" name="139" href="#139">139</a> jamonWriter.write(<span class="jxr_string">"class=\"active\""</span>);
+<a class="jxr_linenumber" name="140" href="#140">140</a> }
+<a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_comment">// 72, 60</em>
+<a class="jxr_linenumber" name="142" href="#142">142</a> jamonWriter.write(<span class="jxr_string">"><a href=\"?filter=handler\">Show All RPC Handler Tasks</a></li>\n <li "</span>);
+<a class="jxr_linenumber" name="143" href="#143">143</a> <em class="jxr_comment">// 73, 9</em>
+<a class="jxr_linenumber" name="144" href="#144">144</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"rpc"</span>))
+<a class="jxr_linenumber" name="145" href="#145">145</a> {
+<a class="jxr_linenumber" name="146" href="#146">146</a> <em class="jxr_comment">// 73, 36</em>
+<a class="jxr_linenumber" name="147" href="#147">147</a> jamonWriter.write(<span class="jxr_string">"class=\"active\""</span>);
+<a class="jxr_linenumber" name="148" href="#148">148</a> }
+<a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_comment">// 73, 56</em>
+<a class="jxr_linenumber" name="150" href="#150">150</a> jamonWriter.write(<span class="jxr_string">"><a href=\"?filter=rpc\">Show Active RPC Calls</a></li>\n <li "</span>);
+<a class="jxr_linenumber" name="151" href="#151">151</a> <em class="jxr_comment">// 74, 9</em>
+<a class="jxr_linenumber" name="152" href="#152">152</a> <strong class="jxr_keyword">if</strong> (filter.equals(<span class="jxr_string">"operation"</span>))
+<a class="jxr_linenumber" name="153" href="#153">153</a> {
+<a class="jxr_linenumber" name="154" href="#154">154</a> <em class="jxr_comment">// 74, 42</em>
+<a class="jxr_linenumber" name="155" href="#155">155</a> jamonWriter.write(<span class="jxr_string">"class=\"active\""</span>);
+<a class="jxr_linenumber" name="156" href="#156">156</a> }
+<a class="jxr_linenumber" name="157" href="#157">157</a> <em class="jxr_comment">// 74, 62</em>
+<a class="jxr_linenumber" name="158" href="#158">158</a> jamonWriter.write(<span class="jxr_string">"><a href=\"?filter=operation\">Show Client Operations</a></li>\n <li><a href=\"?format=json&filter="</span>);
+<a class="jxr_linenumber" name="159" href="#159">159</a> <em class="jxr_comment">// 75, 38</em>
+<a class="jxr_linenumber" name="160" href="#160">160</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(encodeFilter()), jamonWriter);
+<a class="jxr_linenumber" name="161" href="#161">161</a> <em class="jxr_comment">// 75, 58</em>
+<a class="jxr_linenumber" name="162" href="#162">162</a> jamonWriter.write(<span class="jxr_string">"\">View as JSON</a></li>\n </ul>\n "</span>);
+<a class="jxr_linenumber" name="163" href="#163">163</a> <em class="jxr_comment">// 77, 3</em>
+<a class="jxr_linenumber" name="164" href="#164">164</a> <strong class="jxr_keyword">if</strong> (tasks.isEmpty())
+<a class="jxr_linenumber" name="165" href="#165">165</a> {
+<a class="jxr_linenumber" name="166" href="#166">166</a> <em class="jxr_comment">// 77, 25</em>
+<a class="jxr_linenumber" name="167" href="#167">167</a> jamonWriter.write(<span class="jxr_string">"\n <p>No tasks currently running on this node.</p>\n "</span>);
+<a class="jxr_linenumber" name="168" href="#168">168</a> }
+<a class="jxr_linenumber" name="169" href="#169">169</a> <em class="jxr_comment">// 79, 3</em>
+<a class="jxr_linenumber" name="170" href="#170">170</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="171" href="#171">171</a> {
+<a class="jxr_linenumber" name="172" href="#172">172</a> <em class="jxr_comment">// 79, 10</em>
+<a class="jxr_linenumber" name="173" href="#173">173</a> jamonWriter.write(<span class="jxr_string">"\n <table class=\"table\">\n <tr>\n <th>Start Time</th>\n <th>Description</th>\n <th>State</th>\n <th>Status</th>\n </tr>\n "</span>);
+<a class="jxr_linenumber" name="174" href="#174">174</a> <em class="jxr_comment">// 87, 5</em>
+<a class="jxr_linenumber" name="175" href="#175">175</a> <strong class="jxr_keyword">for</strong> (MonitoredTask task : tasks )
+<a class="jxr_linenumber" name="176" href="#176">176</a> {
+<a class="jxr_linenumber" name="177" href="#177">177</a> <em class="jxr_comment">// 87, 40</em>
+<a class="jxr_linenumber" name="178" href="#178">178</a> jamonWriter.write(<span class="jxr_string">"\n <tr class=\""</span>);
+<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_comment">// 88, 16</em>
+<a class="jxr_linenumber" name="180" href="#180">180</a> {
+<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_comment">// 88, 16</em>
+<a class="jxr_linenumber" name="182" href="#182">182</a> __jamon_innerUnit__stateCss(jamonWriter, task.getState() );
+<a class="jxr_linenumber" name="183" href="#183">183</a> }
+<a class="jxr_linenumber" name="184" href="#184">184</a> <em class="jxr_comment">// 88, 55</em>
+<a class="jxr_linenumber" name="185" href="#185">185</a> jamonWriter.write(<span class="jxr_string">"\">\n <td>"</span>);
+<a class="jxr_linenumber" name="186" href="#186">186</a> <em class="jxr_comment">// 89, 11</em>
+<a class="jxr_linenumber" name="187" href="#187">187</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(<strong class="jxr_keyword">new</strong> Date(task.getStartTime())), jamonWriter);
+<a class="jxr_linenumber" name="188" href="#188">188</a> <em class="jxr_comment">// 89, 46</em>
+<a class="jxr_linenumber" name="189" href="#189">189</a> jamonWriter.write(<span class="jxr_string">"</td>\n <td>"</span>);
+<a class="jxr_linenumber" name="190" href="#190">190</a> <em class="jxr_comment">// 90, 11</em>
+<a class="jxr_linenumber" name="191" href="#191">191</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(task.getDescription()), jamonWriter);
+<a class="jxr_linenumber" name="192" href="#192">192</a> <em class="jxr_comment">// 90, 38</em>
+<a class="jxr_linenumber" name="193" href="#193">193</a> jamonWriter.write(<span class="jxr_string">"</td>\n <td>"</span>);
+<a class="jxr_linenumber" name="194" href="#194">194</a> <em class="jxr_comment">// 91, 11</em>
+<a class="jxr_linenumber" name="195" href="#195">195</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(task.getState()), jamonWriter);
+<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_comment">// 91, 32</em>
+<a class="jxr_linenumber" name="197" href="#197">197</a> jamonWriter.write(<span class="jxr_string">"\n (since "</span>);
+<a class="jxr_linenumber" name="198" href="#198">198</a> <em class="jxr_comment">// 92, 18</em>
+<a class="jxr_linenumber" name="199" href="#199">199</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(StringUtils.formatTimeDiff(now, task.getStateTime())), jamonWriter);
+<a class="jxr_linenumber" name="200" href="#200">200</a> <em class="jxr_comment">// 92, 76</em>
+<a class="jxr_linenumber" name="201" href="#201">201</a> jamonWriter.write(<span class="jxr_string">" ago)\n </td>\n <td>"</span>);
+<a class="jxr_linenumber" name="202" href="#202">202</a> <em class="jxr_comment">// 94, 11</em>
+<a class="jxr_linenumber" name="203" href="#203">203</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(task.getStatus()), jamonWriter);
+<a class="jxr_linenumber" name="204" href="#204">204</a> <em class="jxr_comment">// 94, 33</em>
+<a class="jxr_linenumber" name="205" href="#205">205</a> jamonWriter.write(<span class="jxr_string">"\n (since "</span>);
+<a class="jxr_linenumber" name="206" href="#206">206</a> <em class="jxr_comment">// 95, 18</em>
+<a class="jxr_linenumber" name="207" href="#207">207</a> org.jamon.escaping.Escaping.HTML.write(org.jamon.emit.StandardEmitter.valueOf(StringUtils.formatTimeDiff(now, task.getStatusTime())), jamonWriter);
+<a class="jxr_linenumber" name="208" href="#208">208</a> <em class="jxr_comment">// 95, 77</em>
+<a class="jxr_linenumber" name="209" href="#209">209</a> jamonWriter.write(<span class="jxr_string">" \n ago)</td>\n </tr>\n "</span>);
+<a class="jxr_linenumber" name="210" href="#210">210</a> }
+<a class="jxr_linenumber" name="211" href="#211">211</a> <em class="jxr_comment">// 98, 12</em>
+<a class="jxr_linenumber" name="212" href="#212">212</a> jamonWriter.write(<span class="jxr_string">"\n </table>\n\n "</span>);
+<a class="jxr_linenumber" name="213" href="#213">213</a> }
+<a class="jxr_linenumber" name="214" href="#214">214</a> <em class="jxr_comment">// 101, 9</em>
+<a class="jxr_linenumber" name="215" href="#215">215</a> jamonWriter.write(<span class="jxr_string">"\n"</span>);
+<a class="jxr_linenumber" name="216" href="#216">216</a> }
+<a class="jxr_linenumber" name="217" href="#217">217</a> <em class="jxr_comment">// 102, 7</em>
+<a class="jxr_linenumber" name="218" href="#218">218</a> jamonWriter.write(<span class="jxr_string">"\n\n\n"</span>);
+<a class="jxr_linenumber" name="219" href="#219">219</a> }
+<a class="jxr_linenumber" name="220" href="#220">220</a>
+<a class="jxr_linenumber" name="221" href="#221">221</a>
+<a class="jxr_linenumber" name="222" href="#222">222</a> <em class="jxr_comment">// 105, 1</em>
+<a class="jxr_linenumber" name="223" href="#223">223</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> __jamon_innerUnit__stateCss(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter, <strong class="jxr_keyword">final</strong> MonitoredTask.State state)
+<a class="jxr_linenumber" name="224" href="#224">224</a> <strong class="jxr_keyword">throws</strong> java.io.IOException
+<a class="jxr_linenumber" name="225" href="#225">225</a> {
+<a class="jxr_linenumber" name="226" href="#226">226</a> <em class="jxr_comment">// 109, 1</em>
+<a class="jxr_linenumber" name="227" href="#227">227</a> <strong class="jxr_keyword">if</strong> (state == MonitoredTask.State.COMPLETE) {
+<a class="jxr_linenumber" name="228" href="#228">228</a> <em class="jxr_comment">// 109, 68</em>
+<a class="jxr_linenumber" name="229" href="#229">229</a> jamonWriter.write(<span class="jxr_string">"alert alert-success"</span>);
+<a class="jxr_linenumber" name="230" href="#230">230</a> <em class="jxr_comment">// 109, 87</em>
+<a class="jxr_linenumber" name="231" href="#231">231</a> }
+<a class="jxr_linenumber" name="232" href="#232">232</a> <em class="jxr_comment">// 110, 1</em>
+<a class="jxr_linenumber" name="233" href="#233">233</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (state == MonitoredTask.State.ABORTED) {
+<a class="jxr_linenumber" name="234" href="#234">234</a> <em class="jxr_comment">// 110, 68</em>
+<a class="jxr_linenumber" name="235" href="#235">235</a> jamonWriter.write(<span class="jxr_string">"alert alert-error"</span>);
+<a class="jxr_linenumber" name="236" href="#236">236</a> <em class="jxr_comment">// 110, 85</em>
+<a class="jxr_linenumber" name="237" href="#237">237</a> }
+<a class="jxr_linenumber" name="238" href="#238">238</a> }
+<a class="jxr_linenumber" name="239" href="#239">239</a>
+<a class="jxr_linenumber" name="240" href="#240">240</a>
+<a class="jxr_linenumber" name="241" href="#241">241</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
[13/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/metrics.html
----------------------------------------------------------------------
diff --git a/metrics.html b/metrics.html
index 548c82f..28023b3 100644
--- a/metrics.html
+++ b/metrics.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) Metrics
@@ -458,7 +458,7 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/modules.html
----------------------------------------------------------------------
diff --git a/modules.html b/modules.html
index 6e3b13a..6513cc2 100644
--- a/modules.html
+++ b/modules.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Modules</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -366,7 +366,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/old_news.html
----------------------------------------------------------------------
diff --git a/old_news.html b/old_news.html
index c8b8804..2e336d5 100644
--- a/old_news.html
+++ b/old_news.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Old Apache HBase (TM) News
@@ -413,7 +413,7 @@ under the License. -->
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/plugin-management.html
----------------------------------------------------------------------
diff --git a/plugin-management.html b/plugin-management.html
index ab4f9ba..14ba158 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Plugin Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -423,7 +423,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/plugins.html
----------------------------------------------------------------------
diff --git a/plugins.html b/plugins.html
index 4ee257a..3b017f2 100644
--- a/plugins.html
+++ b/plugins.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Build Plugins</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -366,7 +366,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/poweredbyhbase.html
----------------------------------------------------------------------
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index 14915b5..67fd92a 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Powered By Apache HBase™</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -768,7 +768,7 @@ under the License. -->
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/project-info.html
----------------------------------------------------------------------
diff --git a/project-info.html b/project-info.html
index eb8dc33..b85c233 100644
--- a/project-info.html
+++ b/project-info.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -340,7 +340,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/project-reports.html
----------------------------------------------------------------------
diff --git a/project-reports.html b/project-reports.html
index f6c82d2..8f9388c 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Generated Reports</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -310,7 +310,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/project-summary.html
----------------------------------------------------------------------
diff --git a/project-summary.html b/project-summary.html
index ccc2c34..4e93c8e 100644
--- a/project-summary.html
+++ b/project-summary.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Summary</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -330,7 +330,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/pseudo-distributed.html
----------------------------------------------------------------------
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index bed0bba..8d0f50a 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Running Apache HBase (TM) in pseudo-distributed mode
@@ -307,7 +307,7 @@ under the License. -->
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/replication.html
----------------------------------------------------------------------
diff --git a/replication.html b/replication.html
index 9ecd9fe..2ee4f87 100644
--- a/replication.html
+++ b/replication.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) Replication
@@ -302,7 +302,7 @@ under the License. -->
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/resources.html
----------------------------------------------------------------------
diff --git a/resources.html b/resources.html
index 5d30d9b..8af09c8 100644
--- a/resources.html
+++ b/resources.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Other Apache HBase (TM) Resources</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -324,7 +324,7 @@ under the License. -->
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/source-repository.html
----------------------------------------------------------------------
diff --git a/source-repository.html b/source-repository.html
index db06d37..58e0a46 100644
--- a/source-repository.html
+++ b/source-repository.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Source Repository</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -298,7 +298,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/sponsors.html
----------------------------------------------------------------------
diff --git a/sponsors.html b/sponsors.html
index 33ef6f4..015949e 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBase™ Sponsors</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -332,7 +332,7 @@ under the License. -->
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/supportingprojects.html
----------------------------------------------------------------------
diff --git a/supportingprojects.html b/supportingprojects.html
index 3995399..4d8376b 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Supporting Projects</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -519,7 +519,7 @@ under the License. -->
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/team-list.html
----------------------------------------------------------------------
diff --git a/team-list.html b/team-list.html
index 9511672..c779389 100644
--- a/team-list.html
+++ b/team-list.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Team list</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -785,7 +785,7 @@ window.onLoad = init();
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index 9713a82..63d37cd 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -670,7 +670,7 @@
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.html#admin">admin</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.html" title="class in org.apache.hadoop.hbase.regionserver">TestMobStoreScanner</a></dt>
<dd> </dd>
-<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#admin">admin</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionMergeTransactionOnCluster</a></dt>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#ADMIN">ADMIN</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionMergeTransactionOnCluster</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html#admin">admin</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestSplitTransactionOnCluster</a></dt>
<dd> </dd>
@@ -682,6 +682,8 @@
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestExportSnapshot.html#admin">admin</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestExportSnapshot.html" title="class in org.apache.hadoop.hbase.snapshot">TestExportSnapshot</a></dt>
<dd> </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#admin">admin</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html" title="class in org.apache.hadoop.hbase.snapshot">TestFlushSnapshotFromClient</a></dt>
+<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.html#admin">admin</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.html" title="class in org.apache.hadoop.hbase.snapshot">TestRestoreFlushSnapshotFromClient</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/TestMultiVersions.html#admin">admin</a></span> - Variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/TestMultiVersions.html" title="class in org.apache.hadoop.hbase">TestMultiVersions</a></dt>
@@ -16933,7 +16935,7 @@
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/procedure/SimpleMasterProcedureManager.html#master">master</a></span> - Variable in class org.apache.hadoop.hbase.procedure.<a href="./org/apache/hadoop/hbase/procedure/SimpleMasterProcedureManager.html" title="class in org.apache.hadoop.hbase.procedure">SimpleMasterProcedureManager</a></dt>
<dd> </dd>
-<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#master">master</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionMergeTransactionOnCluster</a></dt>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#MASTER">MASTER</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionMergeTransactionOnCluster</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.html#master">master</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionServerReportForDuty</a></dt>
<dd> </dd>
@@ -46849,16 +46851,22 @@
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionIncrement.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionIncrement.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionIncrement</a></dt>
<dd> </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionMergeTransactionOnCluster</a></dt>
+<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/TestScanner.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/TestScanner.html" title="class in org.apache.hadoop.hbase.regionserver">TestScanner</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.wal.<a href="./org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.html" title="class in org.apache.hadoop.hbase.regionserver.wal">TestLogRollingNoCluster</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestExportSnapshot.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestExportSnapshot.html" title="class in org.apache.hadoop.hbase.snapshot">TestExportSnapshot</a></dt>
<dd> </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html" title="class in org.apache.hadoop.hbase.snapshot">TestFlushSnapshotFromClient</a></dt>
+<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.snapshot.<a href="./org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.html" title="class in org.apache.hadoop.hbase.snapshot">TestSecureExportSnapshot</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.TimeBoundedMultiThreadedReader.TimeoutThread.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.test.<a href="./org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.TimeBoundedMultiThreadedReader.TimeoutThread.html" title="class in org.apache.hadoop.hbase.test">IntegrationTestTimeBoundedRequestsWithRegionReplicas.TimeBoundedMultiThreadedReader.TimeoutThread</a></dt>
<dd> </dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html" title="class in org.apache.hadoop.hbase">TestIPv6NIOServerSocketChannel</a></dt>
+<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/TestTimeout.html#timeout">timeout</a></span> - Variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/TestTimeout.html" title="class in org.apache.hadoop.hbase">TestTimeout</a></dt>
<dd> </dd>
<dt><span class="strong"><a href="./org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.html#TIMEOUT_KEY">TIMEOUT_KEY</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.html" title="class in org.apache.hadoop.hbase">IntegrationTestLazyCfLoading</a></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html b/testdevapidocs/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
index 137e89a..f4f2a7b 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
@@ -95,7 +95,7 @@
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.48">TestIPv6NIOServerSocketChannel</a>
+<pre>public class <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.50">TestIPv6NIOServerSocketChannel</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">This tests whether ServerSocketChannel works over ipv6, which Zookeeper
depends on. On Windows Oracle JDK 6, creating a ServerSocketChannel throws
@@ -128,6 +128,10 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<td class="colFirst"><code>private static org.apache.commons.logging.Log</code></td>
<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#LOG">LOG</a></strong></code> </td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>org.junit.rules.TestRule</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#timeout">timeout</a></strong></code> </td>
+</tr>
</table>
</li>
</ul>
@@ -222,10 +226,19 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<a name="LOG">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>LOG</h4>
-<pre>private static final org.apache.commons.logging.Log <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.50">LOG</a></pre>
+<pre>private static final org.apache.commons.logging.Log <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.52">LOG</a></pre>
+</li>
+</ul>
+<a name="timeout">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>timeout</h4>
+<pre>public final org.junit.rules.TestRule <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.55">timeout</a></pre>
</li>
</ul>
</li>
@@ -242,7 +255,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>TestIPv6NIOServerSocketChannel</h4>
-<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.48">TestIPv6NIOServerSocketChannel</a>()</pre>
+<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.50">TestIPv6NIOServerSocketChannel</a>()</pre>
</li>
</ul>
</li>
@@ -259,7 +272,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>bindServerSocket</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.55">bindServerSocket</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a> inetAddr)
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.60">bindServerSocket</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a> inetAddr)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Creates and binds a regular ServerSocket.</div>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -272,7 +285,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>bindNIOServerSocket</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.80">bindNIOServerSocket</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a> inetAddr)
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.85">bindNIOServerSocket</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a> inetAddr)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Creates a NIO ServerSocketChannel, and gets the ServerSocket from
there. Then binds the obtained socket.
@@ -288,7 +301,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testServerSocket</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.109">testServerSocket</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.114">testServerSocket</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Checks whether we are effected by the JDK issue on windows, and if so
ensures that we are running with preferIPv4Stack=true.</div>
@@ -302,7 +315,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ensurePreferIPv4</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.134">ensurePreferIPv4</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.139">ensurePreferIPv4</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Checks whether we are running with java.net.preferIPv4Stack=true</div>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -315,7 +328,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testServerSocketFromLocalhostResolution</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.147">testServerSocketFromLocalhostResolution</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.152">testServerSocketFromLocalhostResolution</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Tests whether every InetAddress we obtain by resolving can open a
ServerSocketChannel.</div>
@@ -329,7 +342,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>main</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.156">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html#line.161">main</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index e4cce93..c423f10 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -157,8 +157,8 @@
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TestCacheOnWrite.CacheOnWriteType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TagUsage.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TagUsage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TestHFileBlockCompatibility.Writer.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TagUsage.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TagUsage</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index 4f3156d..00dd4d2 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -515,16 +515,16 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.RoleCommand</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ClusterManager.ServiceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestRegionServerMetrics.Metric.html" title="enum in org.apache.hadoop.hbase"><span class="strong">TestRegionServerMetrics.Metric</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HBaseClusterManager.CommandProvider.Operation</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ScanPerformanceEvaluation.ScanCounter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestRegionServerMetrics.Metric.html" title="enum in org.apache.hadoop.hbase"><span class="strong">TestRegionServerMetrics.Metric</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="strong">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="strong">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.RoleCommand</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.Service</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ResourceChecker.Phase</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.Service</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index f45510d..b6de721 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -145,8 +145,8 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
index 86f2968..a7e259c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
@@ -118,7 +118,7 @@
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.509">TestRegionMergeTransactionOnCluster.MyMaster</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.513">TestRegionMergeTransactionOnCluster.MyMaster</a>
extends org.apache.hadoop.hbase.master.HMaster</pre>
</li>
</ul>
@@ -288,7 +288,7 @@ extends org.apache.hadoop.hbase.master.HMaster</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>TestRegionMergeTransactionOnCluster.MyMaster</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html#line.510">TestRegionMergeTransactionOnCluster.MyMaster</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html#line.514">TestRegionMergeTransactionOnCluster.MyMaster</a>(org.apache.hadoop.conf.Configuration conf,
org.apache.hadoop.hbase.CoordinatedStateManager cp)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
org.apache.zookeeper.KeeperException,
@@ -313,7 +313,7 @@ extends org.apache.hadoop.hbase.master.HMaster</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>createRpcServices</h4>
-<pre>protected org.apache.hadoop.hbase.regionserver.RSRpcServices <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html#line.517">createRpcServices</a>()
+<pre>protected org.apache.hadoop.hbase.regionserver.RSRpcServices <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html#line.521">createRpcServices</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><strong>Overrides:</strong></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
index b5060ce..adf519b 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html
@@ -113,7 +113,7 @@
</dl>
<hr>
<br>
-<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.522">TestRegionMergeTransactionOnCluster.MyMasterRpcServices</a>
+<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.526">TestRegionMergeTransactionOnCluster.MyMasterRpcServices</a>
extends org.apache.hadoop.hbase.master.MasterRpcServices</pre>
</li>
</ul>
@@ -242,7 +242,7 @@ extends org.apache.hadoop.hbase.master.MasterRpcServices</pre>
<ul class="blockList">
<li class="blockList">
<h4>enabled</h4>
-<pre>static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicBoolean</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.523">enabled</a></pre>
+<pre>static <a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true" title="class or interface in java.util.concurrent.atomic">AtomicBoolean</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.527">enabled</a></pre>
</li>
</ul>
<a name="myMaster">
@@ -251,7 +251,7 @@ extends org.apache.hadoop.hbase.master.MasterRpcServices</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>myMaster</h4>
-<pre>private org.apache.hadoop.hbase.master.HMaster <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.525">myMaster</a></pre>
+<pre>private org.apache.hadoop.hbase.master.HMaster <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.529">myMaster</a></pre>
</li>
</ul>
</li>
@@ -268,7 +268,7 @@ extends org.apache.hadoop.hbase.master.MasterRpcServices</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>TestRegionMergeTransactionOnCluster.MyMasterRpcServices</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.526">TestRegionMergeTransactionOnCluster.MyMasterRpcServices</a>(org.apache.hadoop.hbase.master.HMaster master)
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.530">TestRegionMergeTransactionOnCluster.MyMasterRpcServices</a>(org.apache.hadoop.hbase.master.HMaster master)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
@@ -288,7 +288,7 @@ extends org.apache.hadoop.hbase.master.MasterRpcServices</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>reportRegionStateTransition</h4>
-<pre>public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.532">reportRegionStateTransition</a>(com.google.protobuf.RpcController c,
+<pre>public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMasterRpcServices.html#line.536">reportRegionStateTransition</a>(com.google.protobuf.RpcController c,
org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest req)
throws com.google.protobuf.ServiceException</pre>
<dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
index fcbd194..eda87b5 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
@@ -95,7 +95,7 @@
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.91">TestRegionMergeTransactionOnCluster</a>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.94">TestRegionMergeTransactionOnCluster</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">Like <a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.html" title="class in org.apache.hadoop.hbase.regionserver"><code>TestRegionMergeTransaction</code></a> in that we're testing
<code>RegionMergeTransactionImpl</code> only the below tests are against a running
@@ -144,7 +144,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</tr>
<tr class="altColor">
<td class="colFirst"><code>private static org.apache.hadoop.hbase.client.Admin</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#admin">admin</a></strong></code> </td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#ADMIN">ADMIN</a></strong></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>private static byte[]</code></td>
@@ -160,7 +160,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
</tr>
<tr class="altColor">
<td class="colFirst"><code>private static org.apache.hadoop.hbase.master.HMaster</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#master">master</a></strong></code> </td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#MASTER">MASTER</a></strong></code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>private static int</code></td>
@@ -187,6 +187,10 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#TEST_UTIL">TEST_UTIL</a></strong></code> </td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code>org.junit.rules.TestRule</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#timeout">timeout</a></strong></code> </td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><code>private static int</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#waitTime">waitTime</a></strong></code> </td>
</tr>
@@ -330,7 +334,16 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>LOG</h4>
-<pre>private static final org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.92">LOG</a></pre>
+<pre>private static final org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.95">LOG</a></pre>
+</li>
+</ul>
+<a name="timeout">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>timeout</h4>
+<pre>public final org.junit.rules.TestRule <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.97">timeout</a></pre>
</li>
</ul>
<a name="NB_SERVERS">
@@ -339,7 +352,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>NB_SERVERS</h4>
-<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.94">NB_SERVERS</a></pre>
+<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.99">NB_SERVERS</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.regionserver.TestRegionMergeTransactionOnCluster.NB_SERVERS">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -349,7 +362,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>FAMILYNAME</h4>
-<pre>private static final byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.96">FAMILYNAME</a></pre>
+<pre>private static final byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.101">FAMILYNAME</a></pre>
</li>
</ul>
<a name="QUALIFIER">
@@ -358,7 +371,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>QUALIFIER</h4>
-<pre>private static final byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.97">QUALIFIER</a></pre>
+<pre>private static final byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.102">QUALIFIER</a></pre>
</li>
</ul>
<a name="ROW">
@@ -367,7 +380,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ROW</h4>
-<pre>private static byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.99">ROW</a></pre>
+<pre>private static byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.104">ROW</a></pre>
</li>
</ul>
<a name="INITIAL_REGION_NUM">
@@ -376,7 +389,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>INITIAL_REGION_NUM</h4>
-<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.100">INITIAL_REGION_NUM</a></pre>
+<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.105">INITIAL_REGION_NUM</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.regionserver.TestRegionMergeTransactionOnCluster.INITIAL_REGION_NUM">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -386,7 +399,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ROWSIZE</h4>
-<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.101">ROWSIZE</a></pre>
+<pre>private static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.106">ROWSIZE</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.regionserver.TestRegionMergeTransactionOnCluster.ROWSIZE">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -396,7 +409,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>ROWS</h4>
-<pre>private static byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.102">ROWS</a></pre>
+<pre>private static byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.107">ROWS</a></pre>
</li>
</ul>
<a name="waitTime">
@@ -405,7 +418,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>waitTime</h4>
-<pre>private static int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.104">waitTime</a></pre>
+<pre>private static int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.109">waitTime</a></pre>
</li>
</ul>
<a name="TEST_UTIL">
@@ -414,25 +427,25 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>TEST_UTIL</h4>
-<pre>static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.106">TEST_UTIL</a></pre>
+<pre>static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.111">TEST_UTIL</a></pre>
</li>
</ul>
-<a name="master">
+<a name="MASTER">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>master</h4>
-<pre>private static org.apache.hadoop.hbase.master.HMaster <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.108">master</a></pre>
+<h4>MASTER</h4>
+<pre>private static org.apache.hadoop.hbase.master.HMaster <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.113">MASTER</a></pre>
</li>
</ul>
-<a name="admin">
+<a name="ADMIN">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>admin</h4>
-<pre>private static org.apache.hadoop.hbase.client.Admin <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.109">admin</a></pre>
+<h4>ADMIN</h4>
+<pre>private static org.apache.hadoop.hbase.client.Admin <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.114">ADMIN</a></pre>
</li>
</ul>
</li>
@@ -449,7 +462,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>TestRegionMergeTransactionOnCluster</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.91">TestRegionMergeTransactionOnCluster</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.94">TestRegionMergeTransactionOnCluster</a>()</pre>
</li>
</ul>
</li>
@@ -466,7 +479,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>beforeAllTests</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.112">beforeAllTests</a>()
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.117">beforeAllTests</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -478,7 +491,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>afterAllTests</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.122">afterAllTests</a>()
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.127">afterAllTests</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -490,7 +503,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testWholesomeMerge</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.127">testWholesomeMerge</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.133">testWholesomeMerge</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -502,7 +515,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testMergeAndRestartingMaster</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.178">testMergeAndRestartingMaster</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.184">testMergeAndRestartingMaster</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Not really restarting the master. Simulate it by clear of new region
state since it is not persisted, will be lost after master restarts.</div>
@@ -516,7 +529,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testCleanMergeReference</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.200">testCleanMergeReference</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.204">testCleanMergeReference</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -528,7 +541,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testMerge</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.312">testMerge</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.316">testMerge</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">This test tests 1, merging region not online;
2, merging same two regions; 3, merging unknown regions.
@@ -544,7 +557,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testMergeWithReplicas</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.359">testMergeWithReplicas</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.363">testMergeWithReplicas</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -556,7 +569,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>mergeRegionsAndVerifyRegionNum</h4>
-<pre>private org.apache.hadoop.hbase.util.PairOfSameType<org.apache.hadoop.hbase.HRegionInfo> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.397">mergeRegionsAndVerifyRegionNum</a>(org.apache.hadoop.hbase.master.HMaster master,
+<pre>private org.apache.hadoop.hbase.util.PairOfSameType<org.apache.hadoop.hbase.HRegionInfo> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.401">mergeRegionsAndVerifyRegionNum</a>(org.apache.hadoop.hbase.master.HMaster master,
org.apache.hadoop.hbase.TableName tablename,
int regionAnum,
int regionBnum,
@@ -572,7 +585,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>requestMergeRegion</h4>
-<pre>private org.apache.hadoop.hbase.util.PairOfSameType<org.apache.hadoop.hbase.HRegionInfo> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.406">requestMergeRegion</a>(org.apache.hadoop.hbase.master.HMaster master,
+<pre>private org.apache.hadoop.hbase.util.PairOfSameType<org.apache.hadoop.hbase.HRegionInfo> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.410">requestMergeRegion</a>(org.apache.hadoop.hbase.master.HMaster master,
org.apache.hadoop.hbase.TableName tablename,
int regionAnum,
int regionBnum)
@@ -587,7 +600,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>waitAndVerifyRegionNum</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.420">waitAndVerifyRegionNum</a>(org.apache.hadoop.hbase.master.HMaster master,
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.424">waitAndVerifyRegionNum</a>(org.apache.hadoop.hbase.master.HMaster master,
org.apache.hadoop.hbase.TableName tablename,
int expectedRegionNum)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -601,7 +614,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>createTableAndLoadData</h4>
-<pre>private org.apache.hadoop.hbase.client.Table <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.443">createTableAndLoadData</a>(org.apache.hadoop.hbase.master.HMaster master,
+<pre>private org.apache.hadoop.hbase.client.Table <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.447">createTableAndLoadData</a>(org.apache.hadoop.hbase.master.HMaster master,
org.apache.hadoop.hbase.TableName tablename)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -614,7 +627,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>createTableAndLoadData</h4>
-<pre>private org.apache.hadoop.hbase.client.Table <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.448">createTableAndLoadData</a>(org.apache.hadoop.hbase.master.HMaster master,
+<pre>private org.apache.hadoop.hbase.client.Table <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.452">createTableAndLoadData</a>(org.apache.hadoop.hbase.master.HMaster master,
org.apache.hadoop.hbase.TableName tablename,
int numRegions,
int replication)
@@ -629,7 +642,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>makeN</h4>
-<pre>private static byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.481">makeN</a>(byte[] base,
+<pre>private static byte[][] <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.485">makeN</a>(byte[] base,
int n)</pre>
</li>
</ul>
@@ -639,7 +652,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>loadData</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.489">loadData</a>(org.apache.hadoop.hbase.client.Table table)
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.493">loadData</a>(org.apache.hadoop.hbase.client.Table table)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
@@ -651,7 +664,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>verifyRowCount</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.497">verifyRowCount</a>(org.apache.hadoop.hbase.client.Table table,
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#line.501">verifyRowCount</a>(org.apache.hadoop.hbase.client.Table table,
int expectedRegionNum)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
[04/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
index b8902cd..752ebfb 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
@@ -19,176 +19,180 @@
<a class="jxr_linenumber" name="9" href="#9">9</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.monitoring.*;
<a class="jxr_linenumber" name="10" href="#10">10</a> <em class="jxr_comment">// 22, 1</em>
<a class="jxr_linenumber" name="11" href="#11">11</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.util.StringUtils;
-<a class="jxr_linenumber" name="12" href="#12">12</a>
-<a class="jxr_linenumber" name="13" href="#13">13</a> @org.jamon.annotations.Template(
-<a class="jxr_linenumber" name="14" href="#14">14</a> signature = <span class="jxr_string">"E1689F04F06BAD5E628913C375AEB2C0"</span>,
-<a class="jxr_linenumber" name="15" href="#15">15</a> optionalArguments = {
-<a class="jxr_linenumber" name="16" href="#16">16</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"taskMonitor"</span>, type = <span class="jxr_string">"TaskMonitor"</span>),
-<a class="jxr_linenumber" name="17" href="#17">17</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="18" href="#18">18</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>)})
-<a class="jxr_linenumber" name="19" href="#19">19</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">TaskMonitorTmpl</a>
-<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy
-<a class="jxr_linenumber" name="21" href="#21">21</a> {
-<a class="jxr_linenumber" name="22" href="#22">22</a>
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">TaskMonitorTmpl</a>(org.jamon.TemplateManager p_manager)
-<a class="jxr_linenumber" name="24" href="#24">24</a> {
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">super</strong>(p_manager);
-<a class="jxr_linenumber" name="26" href="#26">26</a> }
-<a class="jxr_linenumber" name="27" href="#27">27</a>
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">TaskMonitorTmpl</a>(String p_path)
-<a class="jxr_linenumber" name="29" href="#29">29</a> {
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">super</strong>(p_path);
-<a class="jxr_linenumber" name="31" href="#31">31</a> }
-<a class="jxr_linenumber" name="32" href="#32">32</a>
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">TaskMonitorTmpl</a>()
-<a class="jxr_linenumber" name="34" href="#34">34</a> {
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">super</strong>(<span class="jxr_string">"/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl"</span>);
-<a class="jxr_linenumber" name="36" href="#36">36</a> }
-<a class="jxr_linenumber" name="37" href="#37">37</a>
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">interface</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">Intf</a>
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy.Intf
-<a class="jxr_linenumber" name="40" href="#40">40</a> {
-<a class="jxr_linenumber" name="41" href="#41">41</a>
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter) <strong class="jxr_keyword">throws</strong> java.io.IOException;
-<a class="jxr_linenumber" name="43" href="#43">43</a>
-<a class="jxr_linenumber" name="44" href="#44">44</a> }
-<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">ImplData</a>
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy.ImplData
-<a class="jxr_linenumber" name="47" href="#47">47</a> {
-<a class="jxr_linenumber" name="48" href="#48">48</a> <em class="jxr_comment">// 25, 1</em>
-<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setTaskMonitor(<a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor)
-<a class="jxr_linenumber" name="50" href="#50">50</a> {
-<a class="jxr_linenumber" name="51" href="#51">51</a> <em class="jxr_comment">// 25, 1</em>
-<a class="jxr_linenumber" name="52" href="#52">52</a> m_taskMonitor = taskMonitor;
-<a class="jxr_linenumber" name="53" href="#53">53</a> m_taskMonitor__IsNotDefault = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="54" href="#54">54</a> }
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> getTaskMonitor()
-<a class="jxr_linenumber" name="56" href="#56">56</a> {
-<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">return</strong> m_taskMonitor;
+<a class="jxr_linenumber" name="12" href="#12">12</a> <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="13" href="#13">13</a> <strong class="jxr_keyword">import</strong> org.owasp.esapi.ESAPI;
+<a class="jxr_linenumber" name="14" href="#14">14</a> <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="15" href="#15">15</a> <strong class="jxr_keyword">import</strong> org.owasp.esapi.errors.EncodingException;
+<a class="jxr_linenumber" name="16" href="#16">16</a>
+<a class="jxr_linenumber" name="17" href="#17">17</a> @org.jamon.annotations.Template(
+<a class="jxr_linenumber" name="18" href="#18">18</a> signature = <span class="jxr_string">"E1689F04F06BAD5E628913C375AEB2C0"</span>,
+<a class="jxr_linenumber" name="19" href="#19">19</a> optionalArguments = {
+<a class="jxr_linenumber" name="20" href="#20">20</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="21" href="#21">21</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"taskMonitor"</span>, type = <span class="jxr_string">"TaskMonitor"</span>),
+<a class="jxr_linenumber" name="22" href="#22">22</a> @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>)})
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">TaskMonitorTmpl</a>
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy
+<a class="jxr_linenumber" name="25" href="#25">25</a> {
+<a class="jxr_linenumber" name="26" href="#26">26</a>
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">TaskMonitorTmpl</a>(org.jamon.TemplateManager p_manager)
+<a class="jxr_linenumber" name="28" href="#28">28</a> {
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">super</strong>(p_manager);
+<a class="jxr_linenumber" name="30" href="#30">30</a> }
+<a class="jxr_linenumber" name="31" href="#31">31</a>
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">TaskMonitorTmpl</a>(String p_path)
+<a class="jxr_linenumber" name="33" href="#33">33</a> {
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">super</strong>(p_path);
+<a class="jxr_linenumber" name="35" href="#35">35</a> }
+<a class="jxr_linenumber" name="36" href="#36">36</a>
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">TaskMonitorTmpl</a>()
+<a class="jxr_linenumber" name="38" href="#38">38</a> {
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">super</strong>(<span class="jxr_string">"/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl"</span>);
+<a class="jxr_linenumber" name="40" href="#40">40</a> }
+<a class="jxr_linenumber" name="41" href="#41">41</a>
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">interface</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">Intf</a>
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy.Intf
+<a class="jxr_linenumber" name="44" href="#44">44</a> {
+<a class="jxr_linenumber" name="45" href="#45">45</a>
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter) <strong class="jxr_keyword">throws</strong> java.io.IOException;
+<a class="jxr_linenumber" name="47" href="#47">47</a>
+<a class="jxr_linenumber" name="48" href="#48">48</a> }
+<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">ImplData</a>
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy.ImplData
+<a class="jxr_linenumber" name="51" href="#51">51</a> {
+<a class="jxr_linenumber" name="52" href="#52">52</a> <em class="jxr_comment">// 29, 1</em>
+<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
+<a class="jxr_linenumber" name="54" href="#54">54</a> {
+<a class="jxr_linenumber" name="55" href="#55">55</a> <em class="jxr_comment">// 29, 1</em>
+<a class="jxr_linenumber" name="56" href="#56">56</a> m_format = format;
+<a class="jxr_linenumber" name="57" href="#57">57</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="58" href="#58">58</a> }
-<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> m_taskMonitor;
-<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getTaskMonitor__IsNotDefault()
-<a class="jxr_linenumber" name="61" href="#61">61</a> {
-<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">return</strong> m_taskMonitor__IsNotDefault;
-<a class="jxr_linenumber" name="63" href="#63">63</a> }
-<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_taskMonitor__IsNotDefault;
-<a class="jxr_linenumber" name="65" href="#65">65</a> <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
-<a class="jxr_linenumber" name="67" href="#67">67</a> {
-<a class="jxr_linenumber" name="68" href="#68">68</a> <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="69" href="#69">69</a> m_filter = filter;
-<a class="jxr_linenumber" name="70" href="#70">70</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="71" href="#71">71</a> }
-<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">public</strong> String getFilter()
-<a class="jxr_linenumber" name="73" href="#73">73</a> {
-<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">return</strong> m_filter;
+<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">public</strong> String getFormat()
+<a class="jxr_linenumber" name="60" href="#60">60</a> {
+<a class="jxr_linenumber" name="61" href="#61">61</a> <strong class="jxr_keyword">return</strong> m_format;
+<a class="jxr_linenumber" name="62" href="#62">62</a> }
+<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> String m_format;
+<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
+<a class="jxr_linenumber" name="65" href="#65">65</a> {
+<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="67" href="#67">67</a> }
+<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="69" href="#69">69</a> <em class="jxr_comment">// 27, 1</em>
+<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setTaskMonitor(<a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor)
+<a class="jxr_linenumber" name="71" href="#71">71</a> {
+<a class="jxr_linenumber" name="72" href="#72">72</a> <em class="jxr_comment">// 27, 1</em>
+<a class="jxr_linenumber" name="73" href="#73">73</a> m_taskMonitor = taskMonitor;
+<a class="jxr_linenumber" name="74" href="#74">74</a> m_taskMonitor__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="75" href="#75">75</a> }
-<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">private</strong> String m_filter;
-<a class="jxr_linenumber" name="77" href="#77">77</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
-<a class="jxr_linenumber" name="78" href="#78">78</a> {
-<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
-<a class="jxr_linenumber" name="80" href="#80">80</a> }
-<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
-<a class="jxr_linenumber" name="82" href="#82">82</a> <em class="jxr_comment">// 27, 1</em>
-<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
-<a class="jxr_linenumber" name="84" href="#84">84</a> {
-<a class="jxr_linenumber" name="85" href="#85">85</a> <em class="jxr_comment">// 27, 1</em>
-<a class="jxr_linenumber" name="86" href="#86">86</a> m_format = format;
-<a class="jxr_linenumber" name="87" href="#87">87</a> m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="88" href="#88">88</a> }
-<a class="jxr_linenumber" name="89" href="#89">89</a> <strong class="jxr_keyword">public</strong> String getFormat()
-<a class="jxr_linenumber" name="90" href="#90">90</a> {
-<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">return</strong> m_format;
+<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> getTaskMonitor()
+<a class="jxr_linenumber" name="77" href="#77">77</a> {
+<a class="jxr_linenumber" name="78" href="#78">78</a> <strong class="jxr_keyword">return</strong> m_taskMonitor;
+<a class="jxr_linenumber" name="79" href="#79">79</a> }
+<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> m_taskMonitor;
+<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getTaskMonitor__IsNotDefault()
+<a class="jxr_linenumber" name="82" href="#82">82</a> {
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">return</strong> m_taskMonitor__IsNotDefault;
+<a class="jxr_linenumber" name="84" href="#84">84</a> }
+<a class="jxr_linenumber" name="85" href="#85">85</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_taskMonitor__IsNotDefault;
+<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_comment">// 28, 1</em>
+<a class="jxr_linenumber" name="87" href="#87">87</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
+<a class="jxr_linenumber" name="88" href="#88">88</a> {
+<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_comment">// 28, 1</em>
+<a class="jxr_linenumber" name="90" href="#90">90</a> m_filter = filter;
+<a class="jxr_linenumber" name="91" href="#91">91</a> m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
<a class="jxr_linenumber" name="92" href="#92">92</a> }
-<a class="jxr_linenumber" name="93" href="#93">93</a> <strong class="jxr_keyword">private</strong> String m_format;
-<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
-<a class="jxr_linenumber" name="95" href="#95">95</a> {
-<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
-<a class="jxr_linenumber" name="97" href="#97">97</a> }
-<a class="jxr_linenumber" name="98" href="#98">98</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
-<a class="jxr_linenumber" name="99" href="#99">99</a> }
-<a class="jxr_linenumber" name="100" href="#100">100</a> @Override
-<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateProxy.ImplData makeImplData()
-<a class="jxr_linenumber" name="102" href="#102">102</a> {
-<a class="jxr_linenumber" name="103" href="#103">103</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">ImplData</a>();
-<a class="jxr_linenumber" name="104" href="#104">104</a> }
-<a class="jxr_linenumber" name="105" href="#105">105</a> @Override <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">ImplData</a> getImplData()
+<a class="jxr_linenumber" name="93" href="#93">93</a> <strong class="jxr_keyword">public</strong> String getFilter()
+<a class="jxr_linenumber" name="94" href="#94">94</a> {
+<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">return</strong> m_filter;
+<a class="jxr_linenumber" name="96" href="#96">96</a> }
+<a class="jxr_linenumber" name="97" href="#97">97</a> <strong class="jxr_keyword">private</strong> String m_filter;
+<a class="jxr_linenumber" name="98" href="#98">98</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
+<a class="jxr_linenumber" name="99" href="#99">99</a> {
+<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="101" href="#101">101</a> }
+<a class="jxr_linenumber" name="102" href="#102">102</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="103" href="#103">103</a> }
+<a class="jxr_linenumber" name="104" href="#104">104</a> @Override
+<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateProxy.ImplData makeImplData()
<a class="jxr_linenumber" name="106" href="#106">106</a> {
-<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">return</strong> (ImplData) <strong class="jxr_keyword">super</strong>.getImplData();
+<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">ImplData</a>();
<a class="jxr_linenumber" name="108" href="#108">108</a> }
-<a class="jxr_linenumber" name="109" href="#109">109</a>
-<a class="jxr_linenumber" name="110" href="#110">110</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor;
-<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setTaskMonitor(<a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> p_taskMonitor)
-<a class="jxr_linenumber" name="112" href="#112">112</a> {
-<a class="jxr_linenumber" name="113" href="#113">113</a> (getImplData()).setTaskMonitor(p_taskMonitor);
-<a class="jxr_linenumber" name="114" href="#114">114</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="115" href="#115">115</a> }
-<a class="jxr_linenumber" name="116" href="#116">116</a>
-<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">protected</strong> String filter;
-<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setFilter(String p_filter)
-<a class="jxr_linenumber" name="119" href="#119">119</a> {
-<a class="jxr_linenumber" name="120" href="#120">120</a> (getImplData()).setFilter(p_filter);
-<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="122" href="#122">122</a> }
-<a class="jxr_linenumber" name="123" href="#123">123</a>
-<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">protected</strong> String format;
-<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setFormat(String p_format)
-<a class="jxr_linenumber" name="126" href="#126">126</a> {
-<a class="jxr_linenumber" name="127" href="#127">127</a> (getImplData()).setFormat(p_format);
-<a class="jxr_linenumber" name="128" href="#128">128</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="129" href="#129">129</a> }
-<a class="jxr_linenumber" name="130" href="#130">130</a>
-<a class="jxr_linenumber" name="131" href="#131">131</a>
-<a class="jxr_linenumber" name="132" href="#132">132</a> @Override
-<a class="jxr_linenumber" name="133" href="#133">133</a> <strong class="jxr_keyword">public</strong> org.jamon.AbstractTemplateImpl constructImpl(Class<? <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateImpl> p_<strong class="jxr_keyword">class</strong>){
-<a class="jxr_linenumber" name="134" href="#134">134</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="135" href="#135">135</a> {
-<a class="jxr_linenumber" name="136" href="#136">136</a> <strong class="jxr_keyword">return</strong> p_<strong class="jxr_keyword">class</strong>
-<a class="jxr_linenumber" name="137" href="#137">137</a> .getConstructor(<strong class="jxr_keyword">new</strong> Class [] { org.jamon.TemplateManager.<strong class="jxr_keyword">class</strong>, ImplData.<strong class="jxr_keyword">class</strong> })
-<a class="jxr_linenumber" name="138" href="#138">138</a> .newInstance(<strong class="jxr_keyword">new</strong> Object [] { getTemplateManager(), getImplData()});
-<a class="jxr_linenumber" name="139" href="#139">139</a> }
-<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">catch</strong> (RuntimeException e)
-<a class="jxr_linenumber" name="141" href="#141">141</a> {
-<a class="jxr_linenumber" name="142" href="#142">142</a> <strong class="jxr_keyword">throw</strong> e;
+<a class="jxr_linenumber" name="109" href="#109">109</a> @Override <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">ImplData</a> getImplData()
+<a class="jxr_linenumber" name="110" href="#110">110</a> {
+<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">return</strong> (ImplData) <strong class="jxr_keyword">super</strong>.getImplData();
+<a class="jxr_linenumber" name="112" href="#112">112</a> }
+<a class="jxr_linenumber" name="113" href="#113">113</a>
+<a class="jxr_linenumber" name="114" href="#114">114</a> <strong class="jxr_keyword">protected</strong> String format;
+<a class="jxr_linenumber" name="115" href="#115">115</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setFormat(String p_format)
+<a class="jxr_linenumber" name="116" href="#116">116</a> {
+<a class="jxr_linenumber" name="117" href="#117">117</a> (getImplData()).setFormat(p_format);
+<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="119" href="#119">119</a> }
+<a class="jxr_linenumber" name="120" href="#120">120</a>
+<a class="jxr_linenumber" name="121" href="#121">121</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor;
+<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setTaskMonitor(<a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> p_taskMonitor)
+<a class="jxr_linenumber" name="123" href="#123">123</a> {
+<a class="jxr_linenumber" name="124" href="#124">124</a> (getImplData()).setTaskMonitor(p_taskMonitor);
+<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="126" href="#126">126</a> }
+<a class="jxr_linenumber" name="127" href="#127">127</a>
+<a class="jxr_linenumber" name="128" href="#128">128</a> <strong class="jxr_keyword">protected</strong> String filter;
+<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setFilter(String p_filter)
+<a class="jxr_linenumber" name="130" href="#130">130</a> {
+<a class="jxr_linenumber" name="131" href="#131">131</a> (getImplData()).setFilter(p_filter);
+<a class="jxr_linenumber" name="132" href="#132">132</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
+<a class="jxr_linenumber" name="133" href="#133">133</a> }
+<a class="jxr_linenumber" name="134" href="#134">134</a>
+<a class="jxr_linenumber" name="135" href="#135">135</a>
+<a class="jxr_linenumber" name="136" href="#136">136</a> @Override
+<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">public</strong> org.jamon.AbstractTemplateImpl constructImpl(Class<? <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateImpl> p_<strong class="jxr_keyword">class</strong>){
+<a class="jxr_linenumber" name="138" href="#138">138</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="139" href="#139">139</a> {
+<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">return</strong> p_<strong class="jxr_keyword">class</strong>
+<a class="jxr_linenumber" name="141" href="#141">141</a> .getConstructor(<strong class="jxr_keyword">new</strong> Class [] { org.jamon.TemplateManager.<strong class="jxr_keyword">class</strong>, ImplData.<strong class="jxr_keyword">class</strong> })
+<a class="jxr_linenumber" name="142" href="#142">142</a> .newInstance(<strong class="jxr_keyword">new</strong> Object [] { getTemplateManager(), getImplData()});
<a class="jxr_linenumber" name="143" href="#143">143</a> }
-<a class="jxr_linenumber" name="144" href="#144">144</a> <strong class="jxr_keyword">catch</strong> (Exception e)
+<a class="jxr_linenumber" name="144" href="#144">144</a> <strong class="jxr_keyword">catch</strong> (RuntimeException e)
<a class="jxr_linenumber" name="145" href="#145">145</a> {
-<a class="jxr_linenumber" name="146" href="#146">146</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e);
+<a class="jxr_linenumber" name="146" href="#146">146</a> <strong class="jxr_keyword">throw</strong> e;
<a class="jxr_linenumber" name="147" href="#147">147</a> }
-<a class="jxr_linenumber" name="148" href="#148">148</a> }
-<a class="jxr_linenumber" name="149" href="#149">149</a>
-<a class="jxr_linenumber" name="150" href="#150">150</a> @Override
-<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateImpl constructImpl(){
-<a class="jxr_linenumber" name="152" href="#152">152</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html">TaskMonitorTmplImpl</a>(getTemplateManager(), getImplData());
-<a class="jxr_linenumber" name="153" href="#153">153</a> }
-<a class="jxr_linenumber" name="154" href="#154">154</a> <strong class="jxr_keyword">public</strong> org.jamon.Renderer makeRenderer()
-<a class="jxr_linenumber" name="155" href="#155">155</a> {
-<a class="jxr_linenumber" name="156" href="#156">156</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> org.jamon.AbstractRenderer() {
-<a class="jxr_linenumber" name="157" href="#157">157</a> @Override
-<a class="jxr_linenumber" name="158" href="#158">158</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderTo(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
-<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">throws</strong> java.io.IOException
-<a class="jxr_linenumber" name="160" href="#160">160</a> {
-<a class="jxr_linenumber" name="161" href="#161">161</a> render(jamonWriter);
-<a class="jxr_linenumber" name="162" href="#162">162</a> }
-<a class="jxr_linenumber" name="163" href="#163">163</a> };
-<a class="jxr_linenumber" name="164" href="#164">164</a> }
-<a class="jxr_linenumber" name="165" href="#165">165</a>
-<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> render(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
-<a class="jxr_linenumber" name="167" href="#167">167</a> <strong class="jxr_keyword">throws</strong> java.io.IOException
-<a class="jxr_linenumber" name="168" href="#168">168</a> {
-<a class="jxr_linenumber" name="169" href="#169">169</a> renderNoFlush(jamonWriter);
-<a class="jxr_linenumber" name="170" href="#170">170</a> jamonWriter.flush();
-<a class="jxr_linenumber" name="171" href="#171">171</a> }
-<a class="jxr_linenumber" name="172" href="#172">172</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
-<a class="jxr_linenumber" name="173" href="#173">173</a> <strong class="jxr_keyword">throws</strong> java.io.IOException
-<a class="jxr_linenumber" name="174" href="#174">174</a> {
-<a class="jxr_linenumber" name="175" href="#175">175</a> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">Intf</a> instance = (Intf) getTemplateManager().constructImpl(<strong class="jxr_keyword">this</strong>);
-<a class="jxr_linenumber" name="176" href="#176">176</a> instance.renderNoFlush(jamonWriter);
-<a class="jxr_linenumber" name="177" href="#177">177</a> reset();
-<a class="jxr_linenumber" name="178" href="#178">178</a> }
-<a class="jxr_linenumber" name="179" href="#179">179</a>
-<a class="jxr_linenumber" name="180" href="#180">180</a>
-<a class="jxr_linenumber" name="181" href="#181">181</a> }
+<a class="jxr_linenumber" name="148" href="#148">148</a> <strong class="jxr_keyword">catch</strong> (Exception e)
+<a class="jxr_linenumber" name="149" href="#149">149</a> {
+<a class="jxr_linenumber" name="150" href="#150">150</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(e);
+<a class="jxr_linenumber" name="151" href="#151">151</a> }
+<a class="jxr_linenumber" name="152" href="#152">152</a> }
+<a class="jxr_linenumber" name="153" href="#153">153</a>
+<a class="jxr_linenumber" name="154" href="#154">154</a> @Override
+<a class="jxr_linenumber" name="155" href="#155">155</a> <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateImpl constructImpl(){
+<a class="jxr_linenumber" name="156" href="#156">156</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html">TaskMonitorTmplImpl</a>(getTemplateManager(), getImplData());
+<a class="jxr_linenumber" name="157" href="#157">157</a> }
+<a class="jxr_linenumber" name="158" href="#158">158</a> <strong class="jxr_keyword">public</strong> org.jamon.Renderer makeRenderer()
+<a class="jxr_linenumber" name="159" href="#159">159</a> {
+<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> org.jamon.AbstractRenderer() {
+<a class="jxr_linenumber" name="161" href="#161">161</a> @Override
+<a class="jxr_linenumber" name="162" href="#162">162</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderTo(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
+<a class="jxr_linenumber" name="163" href="#163">163</a> <strong class="jxr_keyword">throws</strong> java.io.IOException
+<a class="jxr_linenumber" name="164" href="#164">164</a> {
+<a class="jxr_linenumber" name="165" href="#165">165</a> render(jamonWriter);
+<a class="jxr_linenumber" name="166" href="#166">166</a> }
+<a class="jxr_linenumber" name="167" href="#167">167</a> };
+<a class="jxr_linenumber" name="168" href="#168">168</a> }
+<a class="jxr_linenumber" name="169" href="#169">169</a>
+<a class="jxr_linenumber" name="170" href="#170">170</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> render(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
+<a class="jxr_linenumber" name="171" href="#171">171</a> <strong class="jxr_keyword">throws</strong> java.io.IOException
+<a class="jxr_linenumber" name="172" href="#172">172</a> {
+<a class="jxr_linenumber" name="173" href="#173">173</a> renderNoFlush(jamonWriter);
+<a class="jxr_linenumber" name="174" href="#174">174</a> jamonWriter.flush();
+<a class="jxr_linenumber" name="175" href="#175">175</a> }
+<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)
+<a class="jxr_linenumber" name="177" href="#177">177</a> <strong class="jxr_keyword">throws</strong> java.io.IOException
+<a class="jxr_linenumber" name="178" href="#178">178</a> {
+<a class="jxr_linenumber" name="179" href="#179">179</a> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">Intf</a> instance = (Intf) getTemplateManager().constructImpl(<strong class="jxr_keyword">this</strong>);
+<a class="jxr_linenumber" name="180" href="#180">180</a> instance.renderNoFlush(jamonWriter);
+<a class="jxr_linenumber" name="181" href="#181">181</a> reset();
+<a class="jxr_linenumber" name="182" href="#182">182</a> }
+<a class="jxr_linenumber" name="183" href="#183">183</a>
+<a class="jxr_linenumber" name="184" href="#184">184</a>
+<a class="jxr_linenumber" name="185" href="#185">185</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
[11/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
index 13e0e7c..1bdbf69 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.MyMaster.html
@@ -42,518 +42,522 @@
<span class="sourceLineNo">034</span>import org.apache.hadoop.conf.Configuration;<a name="line.34"></a>
<span class="sourceLineNo">035</span>import org.apache.hadoop.fs.FileSystem;<a name="line.35"></a>
<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.Path;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HConstants;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.ServerName;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.TableName;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.UnknownRegionException;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Put;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.client.RegionReplicaUtil;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.Result;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.Table;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.exceptions.MergeRegionException;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.master.AssignmentManager;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.master.MasterRpcServices;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.master.RegionState.State;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.master.RegionStates;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.util.PairOfSameType;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import org.apache.hadoop.util.StringUtils;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import org.apache.zookeeper.KeeperException;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>import org.junit.AfterClass;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>import org.junit.BeforeClass;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>import org.junit.Test;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>import org.junit.experimental.categories.Category;<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>import com.google.common.base.Joiner;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>import com.google.protobuf.RpcController;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>import com.google.protobuf.ServiceException;<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>/**<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * Like {@link TestRegionMergeTransaction} in that we're testing<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * {@link RegionMergeTransactionImpl} only the below tests are against a running<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * cluster where {@link TestRegionMergeTransaction} is tests against bare<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * {@link HRegion}.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> */<a name="line.89"></a>
-<span class="sourceLineNo">090</span>@Category({RegionServerTests.class, LargeTests.class})<a name="line.90"></a>
-<span class="sourceLineNo">091</span>public class TestRegionMergeTransactionOnCluster {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> private static final Log LOG = LogFactory<a name="line.92"></a>
-<span class="sourceLineNo">093</span> .getLog(TestRegionMergeTransactionOnCluster.class);<a name="line.93"></a>
-<span class="sourceLineNo">094</span> private static final int NB_SERVERS = 3;<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span> private static final byte[] FAMILYNAME = Bytes.toBytes("fam");<a name="line.96"></a>
-<span class="sourceLineNo">097</span> private static final byte[] QUALIFIER = Bytes.toBytes("q");<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> private static byte[] ROW = Bytes.toBytes("testRow");<a name="line.99"></a>
-<span class="sourceLineNo">100</span> private static final int INITIAL_REGION_NUM = 10;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> private static final int ROWSIZE = 200;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> private static byte[][] ROWS = makeN(ROW, ROWSIZE);<a name="line.102"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.CategoryBasedTimeout;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HConstants;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.ServerName;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.TableName;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.UnknownRegionException;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.client.Put;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.RegionReplicaUtil;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.Result;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.client.Table;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.exceptions.MergeRegionException;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.master.AssignmentManager;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.master.MasterRpcServices;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.master.RegionState.State;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.master.RegionStates;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import org.apache.hadoop.hbase.util.PairOfSameType;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import org.apache.hadoop.util.StringUtils;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>import org.apache.zookeeper.KeeperException;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>import org.junit.AfterClass;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>import org.junit.BeforeClass;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>import org.junit.Rule;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>import org.junit.Test;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>import org.junit.experimental.categories.Category;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>import org.junit.rules.TestRule;<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>import com.google.common.base.Joiner;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>import com.google.protobuf.RpcController;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>import com.google.protobuf.ServiceException;<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>/**<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * Like {@link TestRegionMergeTransaction} in that we're testing<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * {@link RegionMergeTransactionImpl} only the below tests are against a running<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * cluster where {@link TestRegionMergeTransaction} is tests against bare<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * {@link HRegion}.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> */<a name="line.92"></a>
+<span class="sourceLineNo">093</span>@Category({RegionServerTests.class, LargeTests.class})<a name="line.93"></a>
+<span class="sourceLineNo">094</span>public class TestRegionMergeTransactionOnCluster {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> private static final Log LOG = LogFactory<a name="line.95"></a>
+<span class="sourceLineNo">096</span> .getLog(TestRegionMergeTransactionOnCluster.class);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> @Rule public final TestRule timeout = CategoryBasedTimeout.builder().withTimeout(this.getClass()).<a name="line.97"></a>
+<span class="sourceLineNo">098</span> withLookingForStuckThread(true).build();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> private static final int NB_SERVERS = 3;<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span> private static final byte[] FAMILYNAME = Bytes.toBytes("fam");<a name="line.101"></a>
+<span class="sourceLineNo">102</span> private static final byte[] QUALIFIER = Bytes.toBytes("q");<a name="line.102"></a>
<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> private static int waitTime = 60 * 1000;<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> private static HMaster master;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> private static Admin admin;<a name="line.109"></a>
+<span class="sourceLineNo">104</span> private static byte[] ROW = Bytes.toBytes("testRow");<a name="line.104"></a>
+<span class="sourceLineNo">105</span> private static final int INITIAL_REGION_NUM = 10;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> private static final int ROWSIZE = 200;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> private static byte[][] ROWS = makeN(ROW, ROWSIZE);<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> private static int waitTime = 60 * 1000;<a name="line.109"></a>
<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> @BeforeClass<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public static void beforeAllTests() throws Exception {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> // Start a cluster<a name="line.113"></a>
-<span class="sourceLineNo">114</span> TEST_UTIL.startMiniCluster(1, NB_SERVERS, null, MyMaster.class, null);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> master = cluster.getMaster();<a name="line.116"></a>
-<span class="sourceLineNo">117</span> master.balanceSwitch(false);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> admin = TEST_UTIL.getHBaseAdmin();<a name="line.118"></a>
-<span class="sourceLineNo">119</span> }<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> @AfterClass<a name="line.121"></a>
-<span class="sourceLineNo">122</span> public static void afterAllTests() throws Exception {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> TEST_UTIL.shutdownMiniCluster();<a name="line.123"></a>
+<span class="sourceLineNo">111</span> static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> private static HMaster MASTER;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> private static Admin ADMIN;<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> @BeforeClass<a name="line.116"></a>
+<span class="sourceLineNo">117</span> public static void beforeAllTests() throws Exception {<a name="line.117"></a>
+<span class="sourceLineNo">118</span> // Start a cluster<a name="line.118"></a>
+<span class="sourceLineNo">119</span> TEST_UTIL.startMiniCluster(1, NB_SERVERS, null, MyMaster.class, null);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.120"></a>
+<span class="sourceLineNo">121</span> MASTER = cluster.getMaster();<a name="line.121"></a>
+<span class="sourceLineNo">122</span> MASTER.balanceSwitch(false);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> ADMIN = TEST_UTIL.getConnection().getAdmin();<a name="line.123"></a>
<span class="sourceLineNo">124</span> }<a name="line.124"></a>
<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> @Test<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public void testWholesomeMerge() throws Exception {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> LOG.info("Starting testWholesomeMerge");<a name="line.128"></a>
-<span class="sourceLineNo">129</span> final TableName tableName =<a name="line.129"></a>
-<span class="sourceLineNo">130</span> TableName.valueOf("testWholesomeMerge");<a name="line.130"></a>
+<span class="sourceLineNo">126</span> @AfterClass<a name="line.126"></a>
+<span class="sourceLineNo">127</span> public static void afterAllTests() throws Exception {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> TEST_UTIL.shutdownMiniCluster();<a name="line.128"></a>
+<span class="sourceLineNo">129</span> if (ADMIN != null) ADMIN.close();<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> // Create table and load data.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> Table table = createTableAndLoadData(master, tableName);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> // Merge 1st and 2nd region<a name="line.134"></a>
-<span class="sourceLineNo">135</span> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,<a name="line.135"></a>
-<span class="sourceLineNo">136</span> INITIAL_REGION_NUM - 1);<a name="line.136"></a>
+<span class="sourceLineNo">132</span> @Test<a name="line.132"></a>
+<span class="sourceLineNo">133</span> public void testWholesomeMerge() throws Exception {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> LOG.info("Starting testWholesomeMerge");<a name="line.134"></a>
+<span class="sourceLineNo">135</span> final TableName tableName =<a name="line.135"></a>
+<span class="sourceLineNo">136</span> TableName.valueOf("testWholesomeMerge");<a name="line.136"></a>
<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span> // Merge 2nd and 3th region<a name="line.138"></a>
-<span class="sourceLineNo">139</span> PairOfSameType<HRegionInfo> mergedRegions =<a name="line.139"></a>
-<span class="sourceLineNo">140</span> mergeRegionsAndVerifyRegionNum(master, tableName, 1, 2,<a name="line.140"></a>
-<span class="sourceLineNo">141</span> INITIAL_REGION_NUM - 2);<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> verifyRowCount(table, ROWSIZE);<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> // Randomly choose one of the two merged regions<a name="line.145"></a>
-<span class="sourceLineNo">146</span> HRegionInfo hri = RandomUtils.nextBoolean() ?<a name="line.146"></a>
-<span class="sourceLineNo">147</span> mergedRegions.getFirst() : mergedRegions.getSecond();<a name="line.147"></a>
-<span class="sourceLineNo">148</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> AssignmentManager am = cluster.getMaster().getAssignmentManager();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> RegionStates regionStates = am.getRegionStates();<a name="line.150"></a>
-<span class="sourceLineNo">151</span> long start = EnvironmentEdgeManager.currentTime();<a name="line.151"></a>
-<span class="sourceLineNo">152</span> while (!regionStates.isRegionInState(hri, State.MERGED)) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> assertFalse("Timed out in waiting one merged region to be in state MERGED",<a name="line.153"></a>
-<span class="sourceLineNo">154</span> EnvironmentEdgeManager.currentTime() - start > 60000);<a name="line.154"></a>
-<span class="sourceLineNo">155</span> Thread.sleep(500);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> // We should not be able to assign it again<a name="line.158"></a>
-<span class="sourceLineNo">159</span> am.assign(hri, true);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> assertFalse("Merged region can't be assigned",<a name="line.160"></a>
-<span class="sourceLineNo">161</span> regionStates.isRegionInTransition(hri));<a name="line.161"></a>
-<span class="sourceLineNo">162</span> assertTrue(regionStates.isRegionInState(hri, State.MERGED));<a name="line.162"></a>
+<span class="sourceLineNo">138</span> // Create table and load data.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> // Merge 1st and 2nd region<a name="line.140"></a>
+<span class="sourceLineNo">141</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1,<a name="line.141"></a>
+<span class="sourceLineNo">142</span> INITIAL_REGION_NUM - 1);<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> // Merge 2nd and 3th region<a name="line.144"></a>
+<span class="sourceLineNo">145</span> PairOfSameType<HRegionInfo> mergedRegions =<a name="line.145"></a>
+<span class="sourceLineNo">146</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 1, 2,<a name="line.146"></a>
+<span class="sourceLineNo">147</span> INITIAL_REGION_NUM - 2);<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> verifyRowCount(table, ROWSIZE);<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> // Randomly choose one of the two merged regions<a name="line.151"></a>
+<span class="sourceLineNo">152</span> HRegionInfo hri = RandomUtils.nextBoolean() ?<a name="line.152"></a>
+<span class="sourceLineNo">153</span> mergedRegions.getFirst() : mergedRegions.getSecond();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();<a name="line.154"></a>
+<span class="sourceLineNo">155</span> AssignmentManager am = cluster.getMaster().getAssignmentManager();<a name="line.155"></a>
+<span class="sourceLineNo">156</span> RegionStates regionStates = am.getRegionStates();<a name="line.156"></a>
+<span class="sourceLineNo">157</span> long start = EnvironmentEdgeManager.currentTime();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> while (!regionStates.isRegionInState(hri, State.MERGED)) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> assertFalse("Timed out in waiting one merged region to be in state MERGED",<a name="line.159"></a>
+<span class="sourceLineNo">160</span> EnvironmentEdgeManager.currentTime() - start > 60000);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> Thread.sleep(500);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> // We should not be able to unassign it either<a name="line.164"></a>
-<span class="sourceLineNo">165</span> am.unassign(hri, null);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> assertFalse("Merged region can't be unassigned",<a name="line.166"></a>
+<span class="sourceLineNo">164</span> // We should not be able to assign it again<a name="line.164"></a>
+<span class="sourceLineNo">165</span> am.assign(hri, true);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> assertFalse("Merged region can't be assigned",<a name="line.166"></a>
<span class="sourceLineNo">167</span> regionStates.isRegionInTransition(hri));<a name="line.167"></a>
<span class="sourceLineNo">168</span> assertTrue(regionStates.isRegionInState(hri, State.MERGED));<a name="line.168"></a>
<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> table.close();<a name="line.170"></a>
-<span class="sourceLineNo">171</span> }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> /**<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * Not really restarting the master. Simulate it by clear of new region<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * state since it is not persisted, will be lost after master restarts.<a name="line.175"></a>
-<span class="sourceLineNo">176</span> */<a name="line.176"></a>
-<span class="sourceLineNo">177</span> @Test<a name="line.177"></a>
-<span class="sourceLineNo">178</span> public void testMergeAndRestartingMaster() throws Exception {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> LOG.info("Starting testMergeAndRestartingMaster");<a name="line.179"></a>
-<span class="sourceLineNo">180</span> final TableName tableName = TableName.valueOf("testMergeAndRestartingMaster");<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> // Create table and load data.<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Table table = createTableAndLoadData(master, tableName);<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> try {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> MyMasterRpcServices.enabled.set(true);<a name="line.186"></a>
+<span class="sourceLineNo">170</span> // We should not be able to unassign it either<a name="line.170"></a>
+<span class="sourceLineNo">171</span> am.unassign(hri, null);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> assertFalse("Merged region can't be unassigned",<a name="line.172"></a>
+<span class="sourceLineNo">173</span> regionStates.isRegionInTransition(hri));<a name="line.173"></a>
+<span class="sourceLineNo">174</span> assertTrue(regionStates.isRegionInState(hri, State.MERGED));<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> table.close();<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span> /**<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * Not really restarting the master. Simulate it by clear of new region<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * state since it is not persisted, will be lost after master restarts.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> */<a name="line.182"></a>
+<span class="sourceLineNo">183</span> @Test<a name="line.183"></a>
+<span class="sourceLineNo">184</span> public void testMergeAndRestartingMaster() throws Exception {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.info("Starting testMergeAndRestartingMaster");<a name="line.185"></a>
+<span class="sourceLineNo">186</span> final TableName tableName = TableName.valueOf("testMergeAndRestartingMaster");<a name="line.186"></a>
<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> // Merge 1st and 2nd region<a name="line.188"></a>
-<span class="sourceLineNo">189</span> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,<a name="line.189"></a>
-<span class="sourceLineNo">190</span> INITIAL_REGION_NUM - 1);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> } finally {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> MyMasterRpcServices.enabled.set(false);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> table.close();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> @SuppressWarnings("deprecation")<a name="line.198"></a>
-<span class="sourceLineNo">199</span> @Test<a name="line.199"></a>
-<span class="sourceLineNo">200</span> public void testCleanMergeReference() throws Exception {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> LOG.info("Starting testCleanMergeReference");<a name="line.201"></a>
-<span class="sourceLineNo">202</span> admin.enableCatalogJanitor(false);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> try {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> final TableName tableName =<a name="line.204"></a>
-<span class="sourceLineNo">205</span> TableName.valueOf("testCleanMergeReference");<a name="line.205"></a>
-<span class="sourceLineNo">206</span> // Create table and load data.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> Table table = createTableAndLoadData(master, tableName);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> // Merge 1st and 2nd region<a name="line.208"></a>
-<span class="sourceLineNo">209</span> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,<a name="line.209"></a>
-<span class="sourceLineNo">210</span> INITIAL_REGION_NUM - 1);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> verifyRowCount(table, ROWSIZE);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> table.close();<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor<a name="line.214"></a>
-<span class="sourceLineNo">215</span> .getTableRegionsAndLocations(master.getConnection(), tableName);<a name="line.215"></a>
-<span class="sourceLineNo">216</span> HRegionInfo mergedRegionInfo = tableRegions.get(0).getFirst();<a name="line.216"></a>
-<span class="sourceLineNo">217</span> HTableDescriptor tableDescriptor = master.getTableDescriptors().get(<a name="line.217"></a>
-<span class="sourceLineNo">218</span> tableName);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> Result mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.219"></a>
-<span class="sourceLineNo">220</span> master.getConnection(), mergedRegionInfo.getRegionName());<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> // contains merge reference in META<a name="line.222"></a>
-<span class="sourceLineNo">223</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.223"></a>
-<span class="sourceLineNo">224</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.224"></a>
-<span class="sourceLineNo">225</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.225"></a>
-<span class="sourceLineNo">226</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span> // merging regions' directory are in the file system all the same<a name="line.228"></a>
-<span class="sourceLineNo">229</span> PairOfSameType<HRegionInfo> p = MetaTableAccessor.getMergeRegions(mergedRegionResult);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> HRegionInfo regionA = p.getFirst();<a name="line.230"></a>
-<span class="sourceLineNo">231</span> HRegionInfo regionB = p.getSecond();<a name="line.231"></a>
-<span class="sourceLineNo">232</span> FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.232"></a>
-<span class="sourceLineNo">233</span> Path rootDir = master.getMasterFileSystem().getRootDir();<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span> Path tabledir = FSUtils.getTableDir(rootDir, mergedRegionInfo.getTable());<a name="line.235"></a>
-<span class="sourceLineNo">236</span> Path regionAdir = new Path(tabledir, regionA.getEncodedName());<a name="line.236"></a>
-<span class="sourceLineNo">237</span> Path regionBdir = new Path(tabledir, regionB.getEncodedName());<a name="line.237"></a>
-<span class="sourceLineNo">238</span> assertTrue(fs.exists(regionAdir));<a name="line.238"></a>
-<span class="sourceLineNo">239</span> assertTrue(fs.exists(regionBdir));<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> HColumnDescriptor[] columnFamilies = tableDescriptor.getColumnFamilies();<a name="line.241"></a>
-<span class="sourceLineNo">242</span> HRegionFileSystem hrfs = new HRegionFileSystem(<a name="line.242"></a>
-<span class="sourceLineNo">243</span> TEST_UTIL.getConfiguration(), fs, tabledir, mergedRegionInfo);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> int count = 0;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> count += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> admin.compactRegion(mergedRegionInfo.getRegionName());<a name="line.248"></a>
-<span class="sourceLineNo">249</span> // clean up the merged region store files<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // wait until merged region have reference file<a name="line.250"></a>
-<span class="sourceLineNo">251</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> int newcount = 0;<a name="line.252"></a>
-<span class="sourceLineNo">253</span> while (System.currentTimeMillis() < timeout) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> newcount += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> if(newcount > count) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> break;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span> Thread.sleep(50);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span> assertTrue(newcount > count);<a name="line.262"></a>
-<span class="sourceLineNo">263</span> List<RegionServerThread> regionServerThreads = TEST_UTIL.getHBaseCluster()<a name="line.263"></a>
-<span class="sourceLineNo">264</span> .getRegionServerThreads();<a name="line.264"></a>
-<span class="sourceLineNo">265</span> for (RegionServerThread rs : regionServerThreads) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> CompactedHFilesDischarger cleaner = new CompactedHFilesDischarger(100, null,<a name="line.266"></a>
-<span class="sourceLineNo">267</span> rs.getRegionServer(), false);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> cleaner.chore();<a name="line.268"></a>
-<span class="sourceLineNo">269</span> Thread.sleep(1000);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> while (System.currentTimeMillis() < timeout) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> int newcount1 = 0;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> newcount1 += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> if(newcount1 <= 1) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> break;<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> Thread.sleep(50);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span> // run CatalogJanitor to clean merge references in hbase:meta and archive the<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // files of merging regions<a name="line.282"></a>
-<span class="sourceLineNo">283</span> int cleaned = 0;<a name="line.283"></a>
-<span class="sourceLineNo">284</span> while (cleaned == 0) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> cleaned = admin.runCatalogScan();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> LOG.debug("catalog janitor returned " + cleaned);<a name="line.286"></a>
-<span class="sourceLineNo">287</span> Thread.sleep(50);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> assertFalse(regionAdir.toString(), fs.exists(regionAdir));<a name="line.289"></a>
-<span class="sourceLineNo">290</span> assertFalse(regionBdir.toString(), fs.exists(regionBdir));<a name="line.290"></a>
-<span class="sourceLineNo">291</span> assertTrue(cleaned > 0);<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.293"></a>
-<span class="sourceLineNo">294</span> master.getConnection(), mergedRegionInfo.getRegionName());<a name="line.294"></a>
-<span class="sourceLineNo">295</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.295"></a>
-<span class="sourceLineNo">296</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.297"></a>
-<span class="sourceLineNo">298</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> } finally {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> admin.enableCatalogJanitor(true);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<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> * This test tests 1, merging region not online;<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * 2, merging same two regions; 3, merging unknown regions.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * They are in one test case so that we don't have to create<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * many tables, and these tests are simple.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> */<a name="line.310"></a>
-<span class="sourceLineNo">311</span> @Test<a name="line.311"></a>
-<span class="sourceLineNo">312</span> public void testMerge() throws Exception {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> LOG.info("Starting testMerge");<a name="line.313"></a>
-<span class="sourceLineNo">314</span> final TableName tableName = TableName.valueOf("testMerge");<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> try {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> // Create table and load data.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> Table table = createTableAndLoadData(master, tableName);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> RegionStates regionStates = master.getAssignmentManager().getRegionStates();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> List<HRegionInfo> regions = regionStates.getRegionsOfTable(tableName);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> // Fake offline one region<a name="line.321"></a>
-<span class="sourceLineNo">322</span> HRegionInfo a = regions.get(0);<a name="line.322"></a>
-<span class="sourceLineNo">323</span> HRegionInfo b = regions.get(1);<a name="line.323"></a>
-<span class="sourceLineNo">324</span> regionStates.regionOffline(a);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> try {<a name="line.325"></a>
-<span class="sourceLineNo">326</span> // Merge offline region. Region a is offline here<a name="line.326"></a>
-<span class="sourceLineNo">327</span> admin.mergeRegions(a.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), false);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> fail("Offline regions should not be able to merge");<a name="line.328"></a>
-<span class="sourceLineNo">329</span> } catch (IOException ie) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> System.out.println(ie);<a name="line.330"></a>
-<span class="sourceLineNo">331</span> assertTrue("Exception should mention regions not online",<a name="line.331"></a>
-<span class="sourceLineNo">332</span> StringUtils.stringifyException(ie).contains("regions not online")<a name="line.332"></a>
-<span class="sourceLineNo">333</span> && ie instanceof MergeRegionException);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> try {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> // Merge the same region: b and b.<a name="line.336"></a>
-<span class="sourceLineNo">337</span> admin.mergeRegions(b.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), true);<a name="line.337"></a>
-<span class="sourceLineNo">338</span> fail("A region should not be able to merge with itself, even forcifully");<a name="line.338"></a>
-<span class="sourceLineNo">339</span> } catch (IOException ie) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> assertTrue("Exception should mention regions not online",<a name="line.340"></a>
-<span class="sourceLineNo">341</span> StringUtils.stringifyException(ie).contains("region to itself")<a name="line.341"></a>
-<span class="sourceLineNo">342</span> && ie instanceof MergeRegionException);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span> try {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> // Merge unknown regions<a name="line.345"></a>
-<span class="sourceLineNo">346</span> admin.mergeRegions(Bytes.toBytes("-f1"), Bytes.toBytes("-f2"), true);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> fail("Unknown region could not be merged");<a name="line.347"></a>
-<span class="sourceLineNo">348</span> } catch (IOException ie) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> assertTrue("UnknownRegionException should be thrown",<a name="line.349"></a>
-<span class="sourceLineNo">350</span> ie instanceof UnknownRegionException);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span> table.close();<a name="line.352"></a>
-<span class="sourceLineNo">353</span> } finally {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> TEST_UTIL.deleteTable(tableName);<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span> @Test<a name="line.358"></a>
-<span class="sourceLineNo">359</span> public void testMergeWithReplicas() throws Exception {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> final TableName tableName = TableName.valueOf("testMergeWithReplicas");<a name="line.360"></a>
-<span class="sourceLineNo">361</span> // Create table and load data.<a name="line.361"></a>
-<span class="sourceLineNo">362</span> createTableAndLoadData(master, tableName, 5, 2);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> List<Pair<HRegionInfo, ServerName>> initialRegionToServers =<a name="line.363"></a>
-<span class="sourceLineNo">364</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.364"></a>
-<span class="sourceLineNo">365</span> master.getConnection(), tableName);<a name="line.365"></a>
-<span class="sourceLineNo">366</span> // Merge 1st and 2nd region<a name="line.366"></a>
-<span class="sourceLineNo">367</span> PairOfSameType<HRegionInfo> mergedRegions = mergeRegionsAndVerifyRegionNum(master, tableName,<a name="line.367"></a>
-<span class="sourceLineNo">368</span> 0, 2, 5 * 2 - 2);<a name="line.368"></a>
-<span class="sourceLineNo">369</span> List<Pair<HRegionInfo, ServerName>> currentRegionToServers =<a name="line.369"></a>
-<span class="sourceLineNo">370</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.370"></a>
-<span class="sourceLineNo">371</span> master.getConnection(), tableName);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> List<HRegionInfo> initialRegions = new ArrayList<HRegionInfo>();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> for (Pair<HRegionInfo, ServerName> p : initialRegionToServers) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> initialRegions.add(p.getFirst());<a name="line.374"></a>
-<span class="sourceLineNo">375</span> }<a name="line.375"></a>
-<span class="sourceLineNo">376</span> List<HRegionInfo> currentRegions = new ArrayList<HRegionInfo>();<a name="line.376"></a>
-<span class="sourceLineNo">377</span> for (Pair<HRegionInfo, ServerName> p : currentRegionToServers) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> currentRegions.add(p.getFirst());<a name="line.378"></a>
+<span class="sourceLineNo">188</span> // Create table and load data.<a name="line.188"></a>
+<span class="sourceLineNo">189</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span> try {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> MyMasterRpcServices.enabled.set(true);<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span> // Merge 1st and 2nd region<a name="line.194"></a>
+<span class="sourceLineNo">195</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1, INITIAL_REGION_NUM - 1);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> } finally {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> MyMasterRpcServices.enabled.set(false);<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> table.close();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> @Test<a name="line.203"></a>
+<span class="sourceLineNo">204</span> public void testCleanMergeReference() throws Exception {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> LOG.info("Starting testCleanMergeReference");<a name="line.205"></a>
+<span class="sourceLineNo">206</span> ADMIN.enableCatalogJanitor(false);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> try {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> final TableName tableName =<a name="line.208"></a>
+<span class="sourceLineNo">209</span> TableName.valueOf("testCleanMergeReference");<a name="line.209"></a>
+<span class="sourceLineNo">210</span> // Create table and load data.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> // Merge 1st and 2nd region<a name="line.212"></a>
+<span class="sourceLineNo">213</span> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1,<a name="line.213"></a>
+<span class="sourceLineNo">214</span> INITIAL_REGION_NUM - 1);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> verifyRowCount(table, ROWSIZE);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> table.close();<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor<a name="line.218"></a>
+<span class="sourceLineNo">219</span> .getTableRegionsAndLocations(MASTER.getConnection(), tableName);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> HRegionInfo mergedRegionInfo = tableRegions.get(0).getFirst();<a name="line.220"></a>
+<span class="sourceLineNo">221</span> HTableDescriptor tableDescriptor = MASTER.getTableDescriptors().get(<a name="line.221"></a>
+<span class="sourceLineNo">222</span> tableName);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> Result mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.223"></a>
+<span class="sourceLineNo">224</span> MASTER.getConnection(), mergedRegionInfo.getRegionName());<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> // contains merge reference in META<a name="line.226"></a>
+<span class="sourceLineNo">227</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.227"></a>
+<span class="sourceLineNo">228</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.229"></a>
+<span class="sourceLineNo">230</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> // merging regions' directory are in the file system all the same<a name="line.232"></a>
+<span class="sourceLineNo">233</span> PairOfSameType<HRegionInfo> p = MetaTableAccessor.getMergeRegions(mergedRegionResult);<a name="line.233"></a>
+<span class="sourceLineNo">234</span> HRegionInfo regionA = p.getFirst();<a name="line.234"></a>
+<span class="sourceLineNo">235</span> HRegionInfo regionB = p.getSecond();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> FileSystem fs = MASTER.getMasterFileSystem().getFileSystem();<a name="line.236"></a>
+<span class="sourceLineNo">237</span> Path rootDir = MASTER.getMasterFileSystem().getRootDir();<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span> Path tabledir = FSUtils.getTableDir(rootDir, mergedRegionInfo.getTable());<a name="line.239"></a>
+<span class="sourceLineNo">240</span> Path regionAdir = new Path(tabledir, regionA.getEncodedName());<a name="line.240"></a>
+<span class="sourceLineNo">241</span> Path regionBdir = new Path(tabledir, regionB.getEncodedName());<a name="line.241"></a>
+<span class="sourceLineNo">242</span> assertTrue(fs.exists(regionAdir));<a name="line.242"></a>
+<span class="sourceLineNo">243</span> assertTrue(fs.exists(regionBdir));<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> HColumnDescriptor[] columnFamilies = tableDescriptor.getColumnFamilies();<a name="line.245"></a>
+<span class="sourceLineNo">246</span> HRegionFileSystem hrfs = new HRegionFileSystem(<a name="line.246"></a>
+<span class="sourceLineNo">247</span> TEST_UTIL.getConfiguration(), fs, tabledir, mergedRegionInfo);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> int count = 0;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> count += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span> ADMIN.compactRegion(mergedRegionInfo.getRegionName());<a name="line.252"></a>
+<span class="sourceLineNo">253</span> // clean up the merged region store files<a name="line.253"></a>
+<span class="sourceLineNo">254</span> // wait until merged region have reference file<a name="line.254"></a>
+<span class="sourceLineNo">255</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.255"></a>
+<span class="sourceLineNo">256</span> int newcount = 0;<a name="line.256"></a>
+<span class="sourceLineNo">257</span> while (System.currentTimeMillis() < timeout) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> newcount += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if(newcount > count) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> break;<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<a name="line.263"></a>
+<span class="sourceLineNo">264</span> Thread.sleep(50);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span> assertTrue(newcount > count);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> List<RegionServerThread> regionServerThreads = TEST_UTIL.getHBaseCluster()<a name="line.267"></a>
+<span class="sourceLineNo">268</span> .getRegionServerThreads();<a name="line.268"></a>
+<span class="sourceLineNo">269</span> for (RegionServerThread rs : regionServerThreads) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> CompactedHFilesDischarger cleaner = new CompactedHFilesDischarger(100, null,<a name="line.270"></a>
+<span class="sourceLineNo">271</span> rs.getRegionServer(), false);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> cleaner.chore();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> Thread.sleep(1000);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span> while (System.currentTimeMillis() < timeout) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> int newcount1 = 0;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> for(HColumnDescriptor colFamily : columnFamilies) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> newcount1 += hrfs.getStoreFiles(colFamily.getName()).size();<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span> if(newcount1 <= 1) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> break;<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> Thread.sleep(50);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> // run CatalogJanitor to clean merge references in hbase:meta and archive the<a name="line.285"></a>
+<span class="sourceLineNo">286</span> // files of merging regions<a name="line.286"></a>
+<span class="sourceLineNo">287</span> int cleaned = 0;<a name="line.287"></a>
+<span class="sourceLineNo">288</span> while (cleaned == 0) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> cleaned = ADMIN.runCatalogScan();<a name="line.289"></a>
+<span class="sourceLineNo">290</span> LOG.debug("catalog janitor returned " + cleaned);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> Thread.sleep(50);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span> assertFalse(regionAdir.toString(), fs.exists(regionAdir));<a name="line.293"></a>
+<span class="sourceLineNo">294</span> assertFalse(regionBdir.toString(), fs.exists(regionBdir));<a name="line.294"></a>
+<span class="sourceLineNo">295</span> assertTrue(cleaned > 0);<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span> mergedRegionResult = MetaTableAccessor.getRegionResult(<a name="line.297"></a>
+<span class="sourceLineNo">298</span> TEST_UTIL.getConnection(), mergedRegionInfo.getRegionName());<a name="line.298"></a>
+<span class="sourceLineNo">299</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.299"></a>
+<span class="sourceLineNo">300</span> HConstants.MERGEA_QUALIFIER) != null);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,<a name="line.301"></a>
+<span class="sourceLineNo">302</span> HConstants.MERGEB_QUALIFIER) != null);<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> } finally {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> ADMIN.enableCatalogJanitor(true);<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><a name="line.308"></a>
+<span class="sourceLineNo">309</span> /**<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * This test tests 1, merging region not online;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * 2, merging same two regions; 3, merging unknown regions.<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * They are in one test case so that we don't have to create<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * many tables, and these tests are simple.<a name="line.313"></a>
+<span class="sourceLineNo">314</span> */<a name="line.314"></a>
+<span class="sourceLineNo">315</span> @Test<a name="line.315"></a>
+<span class="sourceLineNo">316</span> public void testMerge() throws Exception {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> LOG.info("Starting testMerge");<a name="line.317"></a>
+<span class="sourceLineNo">318</span> final TableName tableName = TableName.valueOf("testMerge");<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> try {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> // Create table and load data.<a name="line.321"></a>
+<span class="sourceLineNo">322</span> Table table = createTableAndLoadData(MASTER, tableName);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> RegionStates regionStates = MASTER.getAssignmentManager().getRegionStates();<a name="line.323"></a>
+<span class="sourceLineNo">324</span> List<HRegionInfo> regions = regionStates.getRegionsOfTable(tableName);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> // Fake offline one region<a name="line.325"></a>
+<span class="sourceLineNo">326</span> HRegionInfo a = regions.get(0);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> HRegionInfo b = regions.get(1);<a name="line.327"></a>
+<span class="sourceLineNo">328</span> regionStates.regionOffline(a);<a name="line.328"></a>
+<span class="sourceLineNo">329</span> try {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> // Merge offline region. Region a is offline here<a name="line.330"></a>
+<span class="sourceLineNo">331</span> ADMIN.mergeRegions(a.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), false);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> fail("Offline regions should not be able to merge");<a name="line.332"></a>
+<span class="sourceLineNo">333</span> } catch (IOException ie) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> System.out.println(ie);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> assertTrue("Exception should mention regions not online",<a name="line.335"></a>
+<span class="sourceLineNo">336</span> StringUtils.stringifyException(ie).contains("regions not online")<a name="line.336"></a>
+<span class="sourceLineNo">337</span> && ie instanceof MergeRegionException);<a name="line.337"></a>
+<span class="sourceLineNo">338</span> }<a name="line.338"></a>
+<span class="sourceLineNo">339</span> try {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // Merge the same region: b and b.<a name="line.340"></a>
+<span class="sourceLineNo">341</span> ADMIN.mergeRegions(b.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), true);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> fail("A region should not be able to merge with itself, even forcifully");<a name="line.342"></a>
+<span class="sourceLineNo">343</span> } catch (IOException ie) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> assertTrue("Exception should mention regions not online",<a name="line.344"></a>
+<span class="sourceLineNo">345</span> StringUtils.stringifyException(ie).contains("region to itself")<a name="line.345"></a>
+<span class="sourceLineNo">346</span> && ie instanceof MergeRegionException);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span> try {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> // Merge unknown regions<a name="line.349"></a>
+<span class="sourceLineNo">350</span> ADMIN.mergeRegions(Bytes.toBytes("-f1"), Bytes.toBytes("-f2"), true);<a name="line.350"></a>
+<span class="sourceLineNo">351</span> fail("Unknown region could not be merged");<a name="line.351"></a>
+<span class="sourceLineNo">352</span> } catch (IOException ie) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> assertTrue("UnknownRegionException should be thrown",<a name="line.353"></a>
+<span class="sourceLineNo">354</span> ie instanceof UnknownRegionException);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> table.close();<a name="line.356"></a>
+<span class="sourceLineNo">357</span> } finally {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> TEST_UTIL.deleteTable(tableName);<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span> @Test<a name="line.362"></a>
+<span class="sourceLineNo">363</span> public void testMergeWithReplicas() throws Exception {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> final TableName tableName = TableName.valueOf("testMergeWithReplicas");<a name="line.364"></a>
+<span class="sourceLineNo">365</span> // Create table and load data.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> createTableAndLoadData(MASTER, tableName, 5, 2);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> List<Pair<HRegionInfo, ServerName>> initialRegionToServers =<a name="line.367"></a>
+<span class="sourceLineNo">368</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.368"></a>
+<span class="sourceLineNo">369</span> TEST_UTIL.getConnection(), tableName);<a name="line.369"></a>
+<span class="sourceLineNo">370</span> // Merge 1st and 2nd region<a name="line.370"></a>
+<span class="sourceLineNo">371</span> PairOfSameType<HRegionInfo> mergedRegions = mergeRegionsAndVerifyRegionNum(MASTER, tableName,<a name="line.371"></a>
+<span class="sourceLineNo">372</span> 0, 2, 5 * 2 - 2);<a name="line.372"></a>
+<span class="sourceLineNo">373</span> List<Pair<HRegionInfo, ServerName>> currentRegionToServers =<a name="line.373"></a>
+<span class="sourceLineNo">374</span> MetaTableAccessor.getTableRegionsAndLocations(<a name="line.374"></a>
+<span class="sourceLineNo">375</span> TEST_UTIL.getConnection(), tableName);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> List<HRegionInfo> initialRegions = new ArrayList<HRegionInfo>();<a name="line.376"></a>
+<span class="sourceLineNo">377</span> for (Pair<HRegionInfo, ServerName> p : initialRegionToServers) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span> initialRegions.add(p.getFirst());<a name="line.378"></a>
<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span> assertTrue(initialRegions.contains(mergedRegions.getFirst())); //this is the first region<a name="line.380"></a>
-<span class="sourceLineNo">381</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.381"></a>
-<span class="sourceLineNo">382</span> mergedRegions.getFirst(), 1))); //this is the replica of the first region<a name="line.382"></a>
-<span class="sourceLineNo">383</span> assertTrue(initialRegions.contains(mergedRegions.getSecond())); //this is the second region<a name="line.383"></a>
-<span class="sourceLineNo">384</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.384"></a>
-<span class="sourceLineNo">385</span> mergedRegions.getSecond(), 1))); //this is the replica of the second region<a name="line.385"></a>
-<span class="sourceLineNo">386</span> assertTrue(!initialRegions.contains(currentRegions.get(0))); //this is the new region<a name="line.386"></a>
-<span class="sourceLineNo">387</span> assertTrue(!initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.387"></a>
-<span class="sourceLineNo">388</span> currentRegions.get(0), 1))); //replica of the new region<a name="line.388"></a>
-<span class="sourceLineNo">389</span> assertTrue(currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.389"></a>
-<span class="sourceLineNo">390</span> currentRegions.get(0), 1))); //replica of the new region<a name="line.390"></a>
-<span class="sourceLineNo">391</span> assertTrue(!currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.391"></a>
-<span class="sourceLineNo">392</span> mergedRegions.getFirst(), 1))); //replica of the merged region<a name="line.392"></a>
-<span class="sourceLineNo">393</span> assertTrue(!currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.393"></a>
-<span class="sourceLineNo">394</span> mergedRegions.getSecond(), 1))); //replica of the merged region<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> private PairOfSameType<HRegionInfo> mergeRegionsAndVerifyRegionNum(<a name="line.397"></a>
-<span class="sourceLineNo">398</span> HMaster master, TableName tablename,<a name="line.398"></a>
-<span class="sourceLineNo">399</span> int regionAnum, int regionBnum, int expectedRegionNum) throws Exception {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> PairOfSameType<HRegionInfo> mergedRegions =<a name="line.400"></a>
-<span class="sourceLineNo">401</span> requestMergeRegion(master, tablename, regionAnum, regionBnum);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> waitAndVerifyRegionNum(master, tablename, expectedRegionNum);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> return mergedRegions;<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> private PairOfSameType<HRegionInfo> requestMergeRegion(<a name="line.406"></a>
-<span class="sourceLineNo">407</span> HMaster master, TableName tablename,<a name="line.407"></a>
-<span class="sourceLineNo">408</span> int regionAnum, int regionBnum) throws Exception {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor<a name="line.409"></a>
-<span class="sourceLineNo">410</span> .getTableRegionsAndLocations(<a name="line.410"></a>
-<span class="sourceLineNo">411</span> master.getConnection(), tablename);<a name="line.411"></a>
-<span class="sourceLineNo">412</span> HRegionInfo regionA = tableRegions.get(regionAnum).getFirst();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> HRegionInfo regionB = tableRegions.get(regionBnum).getFirst();<a name="line.413"></a>
-<span class="sourceLineNo">414</span> TEST_UTIL.getHBaseAdmin().mergeRegions(<a name="line.414"></a>
-<span class="sourceLineNo">415</span> regionA.getEncodedNameAsBytes(),<a name="line.415"></a>
-<span class="sourceLineNo">416</span> regionB.getEncodedNameAsBytes(), false);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return new PairOfSameType<HRegionInfo>(regionA, regionB);<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> private void waitAndVerifyRegionNum(HMaster master, TableName tablename,<a name="line.420"></a>
-<span class="sourceLineNo">421</span> int expectedRegionNum) throws Exception {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> List<Pair<HRegionInfo, ServerName>> tableRegionsInMeta;<a name="line.422"></a>
-<span class="sourceLineNo">423</span> List<HRegionInfo> tableRegionsInMaster;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> while (System.currentTimeMillis() < timeout) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> tableRegionsInMeta = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.426"></a>
-<span class="sourceLineNo">427</span> master.getConnection(), tablename);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> tableRegionsInMaster = master.getAssignmentManager().getRegionStates()<a name="line.428"></a>
-<span class="sourceLineNo">429</span> .getRegionsOfTable(tablename);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> if (tableRegionsInMeta.size() == expectedRegionNum<a name="line.430"></a>
-<span class="sourceLineNo">431</span> && tableRegionsInMaster.size() == expectedRegionNum) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> break;<a name="line.432"></a>
-<span class="sourceLineNo">433</span> }<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Thread.sleep(250);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> }<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span> tableRegionsInMeta = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.437"></a>
-<span class="sourceLineNo">438</span> master.getConnection(), tablename);<a name="line.438"></a>
-<span class="sourceLineNo">439</span> LOG.info("Regions after merge:" + Joiner.on(',').join(tableRegionsInMeta));<a name="line.439"></a>
-<span class="sourceLineNo">440</span> assertEquals(expectedRegionNum, tableRegionsInMeta.size());<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> private Table createTableAndLoadData(HMaster master, TableName tablename)<a name="line.443"></a>
-<span class="sourceLineNo">444</span> throws Exception {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> return createTableAndLoadData(master, tablename, INITIAL_REGION_NUM, 1);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span> private Table createTableAndLoadData(HMaster master, TableName tablename,<a name="line.448"></a>
-<span class="sourceLineNo">449</span> int numRegions, int replication) throws Exception {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> assertTrue("ROWSIZE must > numregions:" + numRegions, ROWSIZE > numRegions);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> byte[][] splitRows = new byte[numRegions - 1][];<a name="line.451"></a>
-<span class="sourceLineNo">452</span> for (int i = 0; i < splitRows.length; i++) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> splitRows[i] = ROWS[(i + 1) * ROWSIZE / numRegions];<a name="line.453"></a>
-<span class="sourceLineNo">454</span> }<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> Table table = TEST_UTIL.createTable(tablename, FAMILYNAME, splitRows);<a name="line.456"></a>
-<span class="sourceLineNo">457</span> if (replication > 1) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> HBaseTestingUtility.setReplicas(admin, tablename, replication);<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
-<span class="sourceLineNo">460</span> loadData(table);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> verifyRowCount(table, ROWSIZE);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> // sleep here is an ugly hack to allow region transitions to finish<a name="line.463"></a>
-<span class="sourceLineNo">464</span> long timeout = System.currentTimeMillis() + waitTime;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> List<Pair<HRegionInfo, ServerName>> tableRegions;<a name="line.465"></a>
-<span class="sourceLineNo">466</span> while (System.currentTimeMillis() < timeout) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> tableRegions = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.467"></a>
-<span class="sourceLineNo">468</span> master.getConnection(), tablename);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (tableRegions.size() == numRegions * replication)<a name="line.469"></a>
-<span class="sourceLineNo">470</span> break;<a name="line.470"></a>
-<span class="sourceLineNo">471</span> Thread.sleep(250);<a name="line.471"></a>
-<span class="sourceLineNo">472</span> }<a name="line.472"></a>
-<span class="sourceLineNo">473</span><a name="line.473"></a>
-<span class="sourceLineNo">474</span> tableRegions = MetaTableAccessor.getTableRegionsAndLocations(<a name="line.474"></a>
-<span class="sourceLineNo">475</span> master.getConnection(), tablename);<a name="line.475"></a>
-<span class="sourceLineNo">476</span> LOG.info("Regions after load: " + Joiner.on(',').join(tableRegions));<a name="line.476"></a>
-<span class="sourceLineNo">477</span> assertEquals(numRegions * replication, tableRegions.size());<a name="line.477"></a>
-<span class="sourceLineNo">478</span> return table;<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span> private static byte[][] makeN(byte[] base, int n) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span> byte[][] ret = new byte[n][];<a name="line.482"></a>
-<span class="sourceLineNo">483</span> for (int i = 0; i < n; i++) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> ret[i] = Bytes.add(base, Bytes.toBytes(String.format("%04d", i)));<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span> return ret;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> }<a name="line.487"></a>
-<span class="sourceLineNo">488</span><a name="line.488"></a>
-<span class="sourceLineNo">489</span> private void loadData(Table table) throws IOException {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> for (int i = 0; i < ROWSIZE; i++) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> Put put = new Put(ROWS[i]);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> put.addColumn(FAMILYNAME, QUALIFIER, Bytes.toBytes(i));<a name="line.492"></a>
-<span class="sourceLineNo">493</span> table.put(put);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> }<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> private void verifyRowCount(Table table, int expectedRegionNum)<a name="line.497"></a>
-<span class="sourceLineNo">498</span> throws IOException {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> ResultScanner scanner = table.getScanner(new Scan());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> int rowCount = 0;<a name="line.500"></a>
-<span class="sourceLineNo">501</span> while (scanner.next() != null) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> rowCount++;<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span> assertEquals(expectedRegionNum, rowCount);<a name="line.504"></a>
-<span class="sourceLineNo">505</span> scanner.close();<a name="line.505"></a>
-<span class="sourceLineNo">506</span> }<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> // Make it public so that JVMClusterUtil can access it.<a name="line.508"></a>
-<span class="sourceLineNo">509</span> public static class MyMaster extends HMaster {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> public MyMaster(Configuration conf, CoordinatedStateManager cp)<a name="line.510"></a>
-<span class="sourceLineNo">511</span> throws IOException, KeeperException,<a name="line.511"></a>
-<span class="sourceLineNo">512</span> InterruptedException {<a name="line.512"></a>
-<span class="sourceLineNo">513</span> super(conf, cp);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> @Override<a name="line.516"></a>
-<span class="sourceLineNo">517</span> protected RSRpcServices createRpcServices() throws IOException {<a name="line.517"></a>
-<span class="sourceLineNo">518</span> return new MyMasterRpcServices(this);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
-<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span> static class MyMasterRpcServices extends MasterRpcServices {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> static AtomicBoolean enabled = new AtomicBoolean(false);<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> private HMaster myMaster;<a name="line.525"></a>
-<span class="sourceLineNo">526</span> public MyMasterRpcServices(HMaster master) throws IOException {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> super(master);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> myMaster = master;<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span> @Override<a name="line.531"></a>
-<span class="sourceLineNo">532</span> public ReportRegionStateTransitionResponse reportRegionStateTransition(RpcController c,<a name="line.532"></a>
-<span class="sourceLineNo">533</span> ReportRegionStateTransitionRequest req) throws ServiceException {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> ReportRegionStateTransitionResponse resp = super.reportRegionStateTransition(c, req);<a name="line.534"></a>
-<span class="sourceLineNo">535</span> if (enabled.get() && req.getTransition(0).getTransitionCode()<a name="line.535"></a>
-<span class="sourceLineNo">536</span> == TransitionCode.READY_TO_MERGE && !resp.hasErrorMessage()) {<a name="line.536"></a>
-<span class="sourceLineNo">537</span> RegionStates regionStates = myMaster.getAssignmentManager().getRegionStates();<a name="line.537"></a>
-<span class="sourceLineNo">538</span> for (RegionState regionState: regionStates.getRegionsInTransition().values()) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span> // Find the merging_new region and remove it<a name="line.539"></a>
-<span class="sourceLineNo">540</span> if (regionState.isMergingNew()) {<a name="line.540"></a>
-<span class="sourceLineNo">541</span> regionStates.deleteRegion(regionState.getRegion());<a name="line.541"></a>
-<span class="sourceLineNo">542</span> }<a name="line.542"></a>
-<span class="sourceLineNo">543</span> }<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span> return resp;<a name="line.545"></a>
-<span class="sourceLineNo">546</span> }<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>}<a name="line.548"></a>
+<span class="sourceLineNo">380</span> List<HRegionInfo> currentRegions = new ArrayList<HRegionInfo>();<a name="line.380"></a>
+<span class="sourceLineNo">381</span> for (Pair<HRegionInfo, ServerName> p : currentRegionToServers) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> currentRegions.add(p.getFirst());<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span> assertTrue(initialRegions.contains(mergedRegions.getFirst())); //this is the first region<a name="line.384"></a>
+<span class="sourceLineNo">385</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.385"></a>
+<span class="sourceLineNo">386</span> mergedRegions.getFirst(), 1))); //this is the replica of the first region<a name="line.386"></a>
+<span class="sourceLineNo">387</span> assertTrue(initialRegions.contains(mergedRegions.getSecond())); //this is the second region<a name="line.387"></a>
+<span class="sourceLineNo">388</span> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(<a name="line.388"></a>
+<span class="sourceLineNo">389</span> mergedRegions.getSecond(), 1))); //this is the replica of the second region<a name="line.389"></a>
+<span class="sourceLineNo">390</span> assertTrue(!initialRegions.contains(currentRegions.get(0))); //this is the
<TRUNCATED>
[16/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index 732ce74..865478b 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -461,12 +461,12 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">PrettyPrinter.Unit</span></a></li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">ChecksumType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">PrettyPrinter.Unit</span></a></li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">PoolMap.PoolType</span></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index 8260133..2cda76d 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -148,9 +148,9 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/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/WALFactory.Providers.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">WALFactory.Providers</span></a></li>
<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/RegionGroupingProvider.Strategies.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">RegionGroupingProvider.Strategies</span></a></li>
<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALKey.Version.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">WALKey.Version</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALFactory.Providers.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">WALFactory.Providers</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
index 1724fe5..c9f2d82 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
@@ -67,15 +67,15 @@
<span class="sourceLineNo">059</span> requiredArguments = {<a name="line.59"></a>
<span class="sourceLineNo">060</span> @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
<span class="sourceLineNo">061</span> optionalArguments = {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.63"></a>
+<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.62"></a>
+<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.63"></a>
<span class="sourceLineNo">064</span> @org.jamon.annotations.Argument(name = "frags", type = "Map<String,Integer>"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.65"></a>
-<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.66"></a>
-<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName")})<a name="line.70"></a>
+<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.65"></a>
+<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.66"></a>
+<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.67"></a>
+<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.68"></a>
+<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.69"></a>
+<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>")})<a name="line.70"></a>
<span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
<span class="sourceLineNo">072</span> extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
<span class="sourceLineNo">073</span>{<a name="line.73"></a>
@@ -116,40 +116,40 @@
<span class="sourceLineNo">108</span> return m_master;<a name="line.108"></a>
<span class="sourceLineNo">109</span> }<a name="line.109"></a>
<span class="sourceLineNo">110</span> private HMaster m_master;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // 27, 1<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public void setFormat(String format)<a name="line.112"></a>
+<span class="sourceLineNo">111</span> // 22, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public void setMetaLocation(ServerName metaLocation)<a name="line.112"></a>
<span class="sourceLineNo">113</span> {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> // 27, 1<a name="line.114"></a>
-<span class="sourceLineNo">115</span> m_format = format;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> m_format__IsNotDefault = true;<a name="line.116"></a>
+<span class="sourceLineNo">114</span> // 22, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span> m_metaLocation = metaLocation;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> m_metaLocation__IsNotDefault = true;<a name="line.116"></a>
<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public String getFormat()<a name="line.118"></a>
+<span class="sourceLineNo">118</span> public ServerName getMetaLocation()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_format;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_metaLocation;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private String m_format;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public boolean getFormat__IsNotDefault()<a name="line.123"></a>
+<span class="sourceLineNo">122</span> private ServerName m_metaLocation;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public boolean getMetaLocation__IsNotDefault()<a name="line.123"></a>
<span class="sourceLineNo">124</span> {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return m_format__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span> return m_metaLocation__IsNotDefault;<a name="line.125"></a>
<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span> private boolean m_format__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> // 25, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.129"></a>
+<span class="sourceLineNo">127</span> private boolean m_metaLocation__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> // 28, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public void setServerManager(ServerManager serverManager)<a name="line.129"></a>
<span class="sourceLineNo">130</span> {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> // 25, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span> m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span> // 28, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span> m_serverManager = serverManager;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> m_serverManager__IsNotDefault = true;<a name="line.133"></a>
<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public boolean getCatalogJanitorEnabled()<a name="line.135"></a>
+<span class="sourceLineNo">135</span> public ServerManager getServerManager()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_catalogJanitorEnabled;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_serverManager;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private boolean m_catalogJanitorEnabled;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span> private ServerManager m_serverManager;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public boolean getServerManager__IsNotDefault()<a name="line.140"></a>
<span class="sourceLineNo">141</span> {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span> return m_serverManager__IsNotDefault;<a name="line.142"></a>
<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">144</span> private boolean m_serverManager__IsNotDefault;<a name="line.144"></a>
<span class="sourceLineNo">145</span> // 21, 1<a name="line.145"></a>
<span class="sourceLineNo">146</span> public void setFrags(Map<String,Integer> frags)<a name="line.146"></a>
<span class="sourceLineNo">147</span> {<a name="line.147"></a>
@@ -167,108 +167,108 @@
<span class="sourceLineNo">159</span> return m_frags__IsNotDefault;<a name="line.159"></a>
<span class="sourceLineNo">160</span> }<a name="line.160"></a>
<span class="sourceLineNo">161</span> private boolean m_frags__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> // 26, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void setFilter(String filter)<a name="line.163"></a>
+<span class="sourceLineNo">162</span> // 29, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.163"></a>
<span class="sourceLineNo">164</span> {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> // 26, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span> m_filter = filter;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> m_filter__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span> // 29, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span> m_assignmentManager = assignmentManager;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> m_assignmentManager__IsNotDefault = true;<a name="line.167"></a>
<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public String getFilter()<a name="line.169"></a>
+<span class="sourceLineNo">169</span> public AssignmentManager getAssignmentManager()<a name="line.169"></a>
<span class="sourceLineNo">170</span> {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> return m_filter;<a name="line.171"></a>
+<span class="sourceLineNo">171</span> return m_assignmentManager;<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> private String m_filter;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public boolean getFilter__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span> private AssignmentManager m_assignmentManager;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.174"></a>
<span class="sourceLineNo">175</span> {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return m_filter__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span> return m_assignmentManager__IsNotDefault;<a name="line.176"></a>
<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> private boolean m_filter__IsNotDefault;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> // 29, 1<a name="line.179"></a>
-<span class="sourceLineNo">180</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.180"></a>
+<span class="sourceLineNo">178</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // 27, 1<a name="line.179"></a>
+<span class="sourceLineNo">180</span> public void setFormat(String format)<a name="line.180"></a>
<span class="sourceLineNo">181</span> {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // 29, 1<a name="line.182"></a>
-<span class="sourceLineNo">183</span> m_assignmentManager = assignmentManager;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> m_assignmentManager__IsNotDefault = true;<a name="line.184"></a>
+<span class="sourceLineNo">182</span> // 27, 1<a name="line.182"></a>
+<span class="sourceLineNo">183</span> m_format = format;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> m_format__IsNotDefault = true;<a name="line.184"></a>
<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> public AssignmentManager getAssignmentManager()<a name="line.186"></a>
+<span class="sourceLineNo">186</span> public String getFormat()<a name="line.186"></a>
<span class="sourceLineNo">187</span> {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return m_assignmentManager;<a name="line.188"></a>
+<span class="sourceLineNo">188</span> return m_format;<a name="line.188"></a>
<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> private AssignmentManager m_assignmentManager;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.191"></a>
+<span class="sourceLineNo">190</span> private String m_format;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public boolean getFormat__IsNotDefault()<a name="line.191"></a>
<span class="sourceLineNo">192</span> {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> return m_assignmentManager__IsNotDefault;<a name="line.193"></a>
+<span class="sourceLineNo">193</span> return m_format__IsNotDefault;<a name="line.193"></a>
<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // 28, 1<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public void setServerManager(ServerManager serverManager)<a name="line.197"></a>
+<span class="sourceLineNo">195</span> private boolean m_format__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // 25, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.197"></a>
<span class="sourceLineNo">198</span> {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> // 28, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span> m_serverManager = serverManager;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> m_serverManager__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span> // 25, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span> m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public ServerManager getServerManager()<a name="line.203"></a>
+<span class="sourceLineNo">203</span> public boolean getCatalogJanitorEnabled()<a name="line.203"></a>
<span class="sourceLineNo">204</span> {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> return m_serverManager;<a name="line.205"></a>
+<span class="sourceLineNo">205</span> return m_catalogJanitorEnabled;<a name="line.205"></a>
<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> private ServerManager m_serverManager;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public boolean getServerManager__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span> private boolean m_catalogJanitorEnabled;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.208"></a>
<span class="sourceLineNo">209</span> {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return m_serverManager__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.210"></a>
<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> private boolean m_serverManager__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> // 24, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.214"></a>
+<span class="sourceLineNo">212</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // 26, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span> public void setFilter(String filter)<a name="line.214"></a>
<span class="sourceLineNo">215</span> {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> // 24, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span> m_deadServers = deadServers;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> m_deadServers__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span> // 26, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span> m_filter = filter;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> m_filter__IsNotDefault = true;<a name="line.218"></a>
<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public Set<ServerName> getDeadServers()<a name="line.220"></a>
+<span class="sourceLineNo">220</span> public String getFilter()<a name="line.220"></a>
<span class="sourceLineNo">221</span> {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return m_deadServers;<a name="line.222"></a>
+<span class="sourceLineNo">222</span> return m_filter;<a name="line.222"></a>
<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> private Set<ServerName> m_deadServers;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public boolean getDeadServers__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span> private String m_filter;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public boolean getFilter__IsNotDefault()<a name="line.225"></a>
<span class="sourceLineNo">226</span> {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return m_deadServers__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span> return m_filter__IsNotDefault;<a name="line.227"></a>
<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> private boolean m_deadServers__IsNotDefault;<a name="line.229"></a>
-<span class="sourceLineNo">230</span> // 23, 1<a name="line.230"></a>
-<span class="sourceLineNo">231</span> public void setServers(List<ServerName> servers)<a name="line.231"></a>
+<span class="sourceLineNo">229</span> private boolean m_filter__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // 24, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.231"></a>
<span class="sourceLineNo">232</span> {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> // 23, 1<a name="line.233"></a>
-<span class="sourceLineNo">234</span> m_servers = servers;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> m_servers__IsNotDefault = true;<a name="line.235"></a>
+<span class="sourceLineNo">233</span> // 24, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span> m_deadServers = deadServers;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> m_deadServers__IsNotDefault = true;<a name="line.235"></a>
<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public List<ServerName> getServers()<a name="line.237"></a>
+<span class="sourceLineNo">237</span> public Set<ServerName> getDeadServers()<a name="line.237"></a>
<span class="sourceLineNo">238</span> {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return m_servers;<a name="line.239"></a>
+<span class="sourceLineNo">239</span> return m_deadServers;<a name="line.239"></a>
<span class="sourceLineNo">240</span> }<a name="line.240"></a>
-<span class="sourceLineNo">241</span> private List<ServerName> m_servers;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> public boolean getServers__IsNotDefault()<a name="line.242"></a>
+<span class="sourceLineNo">241</span> private Set<ServerName> m_deadServers;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> public boolean getDeadServers__IsNotDefault()<a name="line.242"></a>
<span class="sourceLineNo">243</span> {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> return m_servers__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span> return m_deadServers__IsNotDefault;<a name="line.244"></a>
<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> private boolean m_servers__IsNotDefault;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> // 22, 1<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public void setMetaLocation(ServerName metaLocation)<a name="line.248"></a>
+<span class="sourceLineNo">246</span> private boolean m_deadServers__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> // 23, 1<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public void setServers(List<ServerName> servers)<a name="line.248"></a>
<span class="sourceLineNo">249</span> {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // 22, 1<a name="line.250"></a>
-<span class="sourceLineNo">251</span> m_metaLocation = metaLocation;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> m_metaLocation__IsNotDefault = true;<a name="line.252"></a>
+<span class="sourceLineNo">250</span> // 23, 1<a name="line.250"></a>
+<span class="sourceLineNo">251</span> m_servers = servers;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> m_servers__IsNotDefault = true;<a name="line.252"></a>
<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> public ServerName getMetaLocation()<a name="line.254"></a>
+<span class="sourceLineNo">254</span> public List<ServerName> getServers()<a name="line.254"></a>
<span class="sourceLineNo">255</span> {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m_metaLocation;<a name="line.256"></a>
+<span class="sourceLineNo">256</span> return m_servers;<a name="line.256"></a>
<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> private ServerName m_metaLocation;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public boolean getMetaLocation__IsNotDefault()<a name="line.259"></a>
+<span class="sourceLineNo">258</span> private List<ServerName> m_servers;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public boolean getServers__IsNotDefault()<a name="line.259"></a>
<span class="sourceLineNo">260</span> {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return m_metaLocation__IsNotDefault;<a name="line.261"></a>
+<span class="sourceLineNo">261</span> return m_servers__IsNotDefault;<a name="line.261"></a>
<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> private boolean m_metaLocation__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span> private boolean m_servers__IsNotDefault;<a name="line.263"></a>
<span class="sourceLineNo">264</span> }<a name="line.264"></a>
<span class="sourceLineNo">265</span> @Override<a name="line.265"></a>
<span class="sourceLineNo">266</span> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.266"></a>
@@ -280,17 +280,17 @@
<span class="sourceLineNo">272</span> return (ImplData) super.getImplData();<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> protected String format;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.276"></a>
+<span class="sourceLineNo">275</span> protected ServerName metaLocation;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.276"></a>
<span class="sourceLineNo">277</span> {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> (getImplData()).setFormat(p_format);<a name="line.278"></a>
+<span class="sourceLineNo">278</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.278"></a>
<span class="sourceLineNo">279</span> return this;<a name="line.279"></a>
<span class="sourceLineNo">280</span> }<a name="line.280"></a>
<span class="sourceLineNo">281</span> <a name="line.281"></a>
-<span class="sourceLineNo">282</span> protected boolean catalogJanitorEnabled;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.283"></a>
+<span class="sourceLineNo">282</span> protected ServerManager serverManager;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.283"></a>
<span class="sourceLineNo">284</span> {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.285"></a>
+<span class="sourceLineNo">285</span> (getImplData()).setServerManager(p_serverManager);<a name="line.285"></a>
<span class="sourceLineNo">286</span> return this;<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>
@@ -301,45 +301,45 @@
<span class="sourceLineNo">293</span> return this;<a name="line.293"></a>
<span class="sourceLineNo">294</span> }<a name="line.294"></a>
<span class="sourceLineNo">295</span> <a name="line.295"></a>
-<span class="sourceLineNo">296</span> protected String filter;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.297"></a>
+<span class="sourceLineNo">296</span> protected AssignmentManager assignmentManager;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.297"></a>
<span class="sourceLineNo">298</span> {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> (getImplData()).setFilter(p_filter);<a name="line.299"></a>
+<span class="sourceLineNo">299</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.299"></a>
<span class="sourceLineNo">300</span> return this;<a name="line.300"></a>
<span class="sourceLineNo">301</span> }<a name="line.301"></a>
<span class="sourceLineNo">302</span> <a name="line.302"></a>
-<span class="sourceLineNo">303</span> protected AssignmentManager assignmentManager;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.304"></a>
+<span class="sourceLineNo">303</span> protected String format;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.304"></a>
<span class="sourceLineNo">305</span> {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.306"></a>
+<span class="sourceLineNo">306</span> (getImplData()).setFormat(p_format);<a name="line.306"></a>
<span class="sourceLineNo">307</span> return this;<a name="line.307"></a>
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
<span class="sourceLineNo">309</span> <a name="line.309"></a>
-<span class="sourceLineNo">310</span> protected ServerManager serverManager;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.311"></a>
+<span class="sourceLineNo">310</span> protected boolean catalogJanitorEnabled;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.311"></a>
<span class="sourceLineNo">312</span> {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> (getImplData()).setServerManager(p_serverManager);<a name="line.313"></a>
+<span class="sourceLineNo">313</span> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.313"></a>
<span class="sourceLineNo">314</span> return this;<a name="line.314"></a>
<span class="sourceLineNo">315</span> }<a name="line.315"></a>
<span class="sourceLineNo">316</span> <a name="line.316"></a>
-<span class="sourceLineNo">317</span> protected Set<ServerName> deadServers;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.318"></a>
+<span class="sourceLineNo">317</span> protected String filter;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.318"></a>
<span class="sourceLineNo">319</span> {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.320"></a>
+<span class="sourceLineNo">320</span> (getImplData()).setFilter(p_filter);<a name="line.320"></a>
<span class="sourceLineNo">321</span> return this;<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> protected List<ServerName> servers;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.325"></a>
+<span class="sourceLineNo">324</span> protected Set<ServerName> deadServers;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.325"></a>
<span class="sourceLineNo">326</span> {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> (getImplData()).setServers(p_servers);<a name="line.327"></a>
+<span class="sourceLineNo">327</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.327"></a>
<span class="sourceLineNo">328</span> return this;<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> protected ServerName metaLocation;<a name="line.331"></a>
-<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.332"></a>
+<span class="sourceLineNo">331</span> protected List<ServerName> servers;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.332"></a>
<span class="sourceLineNo">333</span> {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.334"></a>
+<span class="sourceLineNo">334</span> (getImplData()).setServers(p_servers);<a name="line.334"></a>
<span class="sourceLineNo">335</span> return this;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
index 1724fe5..c9f2d82 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
@@ -67,15 +67,15 @@
<span class="sourceLineNo">059</span> requiredArguments = {<a name="line.59"></a>
<span class="sourceLineNo">060</span> @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
<span class="sourceLineNo">061</span> optionalArguments = {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.63"></a>
+<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.62"></a>
+<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.63"></a>
<span class="sourceLineNo">064</span> @org.jamon.annotations.Argument(name = "frags", type = "Map<String,Integer>"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.65"></a>
-<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.66"></a>
-<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName")})<a name="line.70"></a>
+<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.65"></a>
+<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.66"></a>
+<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.67"></a>
+<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.68"></a>
+<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.69"></a>
+<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>")})<a name="line.70"></a>
<span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
<span class="sourceLineNo">072</span> extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
<span class="sourceLineNo">073</span>{<a name="line.73"></a>
@@ -116,40 +116,40 @@
<span class="sourceLineNo">108</span> return m_master;<a name="line.108"></a>
<span class="sourceLineNo">109</span> }<a name="line.109"></a>
<span class="sourceLineNo">110</span> private HMaster m_master;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // 27, 1<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public void setFormat(String format)<a name="line.112"></a>
+<span class="sourceLineNo">111</span> // 22, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public void setMetaLocation(ServerName metaLocation)<a name="line.112"></a>
<span class="sourceLineNo">113</span> {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> // 27, 1<a name="line.114"></a>
-<span class="sourceLineNo">115</span> m_format = format;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> m_format__IsNotDefault = true;<a name="line.116"></a>
+<span class="sourceLineNo">114</span> // 22, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span> m_metaLocation = metaLocation;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> m_metaLocation__IsNotDefault = true;<a name="line.116"></a>
<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public String getFormat()<a name="line.118"></a>
+<span class="sourceLineNo">118</span> public ServerName getMetaLocation()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_format;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_metaLocation;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private String m_format;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public boolean getFormat__IsNotDefault()<a name="line.123"></a>
+<span class="sourceLineNo">122</span> private ServerName m_metaLocation;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public boolean getMetaLocation__IsNotDefault()<a name="line.123"></a>
<span class="sourceLineNo">124</span> {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return m_format__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span> return m_metaLocation__IsNotDefault;<a name="line.125"></a>
<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span> private boolean m_format__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> // 25, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.129"></a>
+<span class="sourceLineNo">127</span> private boolean m_metaLocation__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> // 28, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public void setServerManager(ServerManager serverManager)<a name="line.129"></a>
<span class="sourceLineNo">130</span> {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> // 25, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span> m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span> // 28, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span> m_serverManager = serverManager;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> m_serverManager__IsNotDefault = true;<a name="line.133"></a>
<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public boolean getCatalogJanitorEnabled()<a name="line.135"></a>
+<span class="sourceLineNo">135</span> public ServerManager getServerManager()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_catalogJanitorEnabled;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_serverManager;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private boolean m_catalogJanitorEnabled;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span> private ServerManager m_serverManager;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public boolean getServerManager__IsNotDefault()<a name="line.140"></a>
<span class="sourceLineNo">141</span> {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span> return m_serverManager__IsNotDefault;<a name="line.142"></a>
<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">144</span> private boolean m_serverManager__IsNotDefault;<a name="line.144"></a>
<span class="sourceLineNo">145</span> // 21, 1<a name="line.145"></a>
<span class="sourceLineNo">146</span> public void setFrags(Map<String,Integer> frags)<a name="line.146"></a>
<span class="sourceLineNo">147</span> {<a name="line.147"></a>
@@ -167,108 +167,108 @@
<span class="sourceLineNo">159</span> return m_frags__IsNotDefault;<a name="line.159"></a>
<span class="sourceLineNo">160</span> }<a name="line.160"></a>
<span class="sourceLineNo">161</span> private boolean m_frags__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> // 26, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void setFilter(String filter)<a name="line.163"></a>
+<span class="sourceLineNo">162</span> // 29, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.163"></a>
<span class="sourceLineNo">164</span> {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> // 26, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span> m_filter = filter;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> m_filter__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span> // 29, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span> m_assignmentManager = assignmentManager;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> m_assignmentManager__IsNotDefault = true;<a name="line.167"></a>
<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public String getFilter()<a name="line.169"></a>
+<span class="sourceLineNo">169</span> public AssignmentManager getAssignmentManager()<a name="line.169"></a>
<span class="sourceLineNo">170</span> {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> return m_filter;<a name="line.171"></a>
+<span class="sourceLineNo">171</span> return m_assignmentManager;<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> private String m_filter;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public boolean getFilter__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span> private AssignmentManager m_assignmentManager;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.174"></a>
<span class="sourceLineNo">175</span> {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return m_filter__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span> return m_assignmentManager__IsNotDefault;<a name="line.176"></a>
<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> private boolean m_filter__IsNotDefault;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> // 29, 1<a name="line.179"></a>
-<span class="sourceLineNo">180</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.180"></a>
+<span class="sourceLineNo">178</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // 27, 1<a name="line.179"></a>
+<span class="sourceLineNo">180</span> public void setFormat(String format)<a name="line.180"></a>
<span class="sourceLineNo">181</span> {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // 29, 1<a name="line.182"></a>
-<span class="sourceLineNo">183</span> m_assignmentManager = assignmentManager;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> m_assignmentManager__IsNotDefault = true;<a name="line.184"></a>
+<span class="sourceLineNo">182</span> // 27, 1<a name="line.182"></a>
+<span class="sourceLineNo">183</span> m_format = format;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> m_format__IsNotDefault = true;<a name="line.184"></a>
<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> public AssignmentManager getAssignmentManager()<a name="line.186"></a>
+<span class="sourceLineNo">186</span> public String getFormat()<a name="line.186"></a>
<span class="sourceLineNo">187</span> {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return m_assignmentManager;<a name="line.188"></a>
+<span class="sourceLineNo">188</span> return m_format;<a name="line.188"></a>
<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> private AssignmentManager m_assignmentManager;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.191"></a>
+<span class="sourceLineNo">190</span> private String m_format;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public boolean getFormat__IsNotDefault()<a name="line.191"></a>
<span class="sourceLineNo">192</span> {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> return m_assignmentManager__IsNotDefault;<a name="line.193"></a>
+<span class="sourceLineNo">193</span> return m_format__IsNotDefault;<a name="line.193"></a>
<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // 28, 1<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public void setServerManager(ServerManager serverManager)<a name="line.197"></a>
+<span class="sourceLineNo">195</span> private boolean m_format__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // 25, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.197"></a>
<span class="sourceLineNo">198</span> {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> // 28, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span> m_serverManager = serverManager;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> m_serverManager__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span> // 25, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span> m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public ServerManager getServerManager()<a name="line.203"></a>
+<span class="sourceLineNo">203</span> public boolean getCatalogJanitorEnabled()<a name="line.203"></a>
<span class="sourceLineNo">204</span> {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> return m_serverManager;<a name="line.205"></a>
+<span class="sourceLineNo">205</span> return m_catalogJanitorEnabled;<a name="line.205"></a>
<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> private ServerManager m_serverManager;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public boolean getServerManager__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span> private boolean m_catalogJanitorEnabled;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.208"></a>
<span class="sourceLineNo">209</span> {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return m_serverManager__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.210"></a>
<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> private boolean m_serverManager__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> // 24, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.214"></a>
+<span class="sourceLineNo">212</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // 26, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span> public void setFilter(String filter)<a name="line.214"></a>
<span class="sourceLineNo">215</span> {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> // 24, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span> m_deadServers = deadServers;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> m_deadServers__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span> // 26, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span> m_filter = filter;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> m_filter__IsNotDefault = true;<a name="line.218"></a>
<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public Set<ServerName> getDeadServers()<a name="line.220"></a>
+<span class="sourceLineNo">220</span> public String getFilter()<a name="line.220"></a>
<span class="sourceLineNo">221</span> {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return m_deadServers;<a name="line.222"></a>
+<span class="sourceLineNo">222</span> return m_filter;<a name="line.222"></a>
<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> private Set<ServerName> m_deadServers;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public boolean getDeadServers__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span> private String m_filter;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public boolean getFilter__IsNotDefault()<a name="line.225"></a>
<span class="sourceLineNo">226</span> {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return m_deadServers__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span> return m_filter__IsNotDefault;<a name="line.227"></a>
<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> private boolean m_deadServers__IsNotDefault;<a name="line.229"></a>
-<span class="sourceLineNo">230</span> // 23, 1<a name="line.230"></a>
-<span class="sourceLineNo">231</span> public void setServers(List<ServerName> servers)<a name="line.231"></a>
+<span class="sourceLineNo">229</span> private boolean m_filter__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // 24, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.231"></a>
<span class="sourceLineNo">232</span> {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> // 23, 1<a name="line.233"></a>
-<span class="sourceLineNo">234</span> m_servers = servers;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> m_servers__IsNotDefault = true;<a name="line.235"></a>
+<span class="sourceLineNo">233</span> // 24, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span> m_deadServers = deadServers;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> m_deadServers__IsNotDefault = true;<a name="line.235"></a>
<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public List<ServerName> getServers()<a name="line.237"></a>
+<span class="sourceLineNo">237</span> public Set<ServerName> getDeadServers()<a name="line.237"></a>
<span class="sourceLineNo">238</span> {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return m_servers;<a name="line.239"></a>
+<span class="sourceLineNo">239</span> return m_deadServers;<a name="line.239"></a>
<span class="sourceLineNo">240</span> }<a name="line.240"></a>
-<span class="sourceLineNo">241</span> private List<ServerName> m_servers;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> public boolean getServers__IsNotDefault()<a name="line.242"></a>
+<span class="sourceLineNo">241</span> private Set<ServerName> m_deadServers;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> public boolean getDeadServers__IsNotDefault()<a name="line.242"></a>
<span class="sourceLineNo">243</span> {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> return m_servers__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span> return m_deadServers__IsNotDefault;<a name="line.244"></a>
<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> private boolean m_servers__IsNotDefault;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> // 22, 1<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public void setMetaLocation(ServerName metaLocation)<a name="line.248"></a>
+<span class="sourceLineNo">246</span> private boolean m_deadServers__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> // 23, 1<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public void setServers(List<ServerName> servers)<a name="line.248"></a>
<span class="sourceLineNo">249</span> {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> // 22, 1<a name="line.250"></a>
-<span class="sourceLineNo">251</span> m_metaLocation = metaLocation;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> m_metaLocation__IsNotDefault = true;<a name="line.252"></a>
+<span class="sourceLineNo">250</span> // 23, 1<a name="line.250"></a>
+<span class="sourceLineNo">251</span> m_servers = servers;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> m_servers__IsNotDefault = true;<a name="line.252"></a>
<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> public ServerName getMetaLocation()<a name="line.254"></a>
+<span class="sourceLineNo">254</span> public List<ServerName> getServers()<a name="line.254"></a>
<span class="sourceLineNo">255</span> {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return m_metaLocation;<a name="line.256"></a>
+<span class="sourceLineNo">256</span> return m_servers;<a name="line.256"></a>
<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> private ServerName m_metaLocation;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public boolean getMetaLocation__IsNotDefault()<a name="line.259"></a>
+<span class="sourceLineNo">258</span> private List<ServerName> m_servers;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public boolean getServers__IsNotDefault()<a name="line.259"></a>
<span class="sourceLineNo">260</span> {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return m_metaLocation__IsNotDefault;<a name="line.261"></a>
+<span class="sourceLineNo">261</span> return m_servers__IsNotDefault;<a name="line.261"></a>
<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> private boolean m_metaLocation__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span> private boolean m_servers__IsNotDefault;<a name="line.263"></a>
<span class="sourceLineNo">264</span> }<a name="line.264"></a>
<span class="sourceLineNo">265</span> @Override<a name="line.265"></a>
<span class="sourceLineNo">266</span> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.266"></a>
@@ -280,17 +280,17 @@
<span class="sourceLineNo">272</span> return (ImplData) super.getImplData();<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> protected String format;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.276"></a>
+<span class="sourceLineNo">275</span> protected ServerName metaLocation;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.276"></a>
<span class="sourceLineNo">277</span> {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> (getImplData()).setFormat(p_format);<a name="line.278"></a>
+<span class="sourceLineNo">278</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.278"></a>
<span class="sourceLineNo">279</span> return this;<a name="line.279"></a>
<span class="sourceLineNo">280</span> }<a name="line.280"></a>
<span class="sourceLineNo">281</span> <a name="line.281"></a>
-<span class="sourceLineNo">282</span> protected boolean catalogJanitorEnabled;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.283"></a>
+<span class="sourceLineNo">282</span> protected ServerManager serverManager;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.283"></a>
<span class="sourceLineNo">284</span> {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.285"></a>
+<span class="sourceLineNo">285</span> (getImplData()).setServerManager(p_serverManager);<a name="line.285"></a>
<span class="sourceLineNo">286</span> return this;<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>
@@ -301,45 +301,45 @@
<span class="sourceLineNo">293</span> return this;<a name="line.293"></a>
<span class="sourceLineNo">294</span> }<a name="line.294"></a>
<span class="sourceLineNo">295</span> <a name="line.295"></a>
-<span class="sourceLineNo">296</span> protected String filter;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.297"></a>
+<span class="sourceLineNo">296</span> protected AssignmentManager assignmentManager;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.297"></a>
<span class="sourceLineNo">298</span> {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> (getImplData()).setFilter(p_filter);<a name="line.299"></a>
+<span class="sourceLineNo">299</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.299"></a>
<span class="sourceLineNo">300</span> return this;<a name="line.300"></a>
<span class="sourceLineNo">301</span> }<a name="line.301"></a>
<span class="sourceLineNo">302</span> <a name="line.302"></a>
-<span class="sourceLineNo">303</span> protected AssignmentManager assignmentManager;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.304"></a>
+<span class="sourceLineNo">303</span> protected String format;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.304"></a>
<span class="sourceLineNo">305</span> {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.306"></a>
+<span class="sourceLineNo">306</span> (getImplData()).setFormat(p_format);<a name="line.306"></a>
<span class="sourceLineNo">307</span> return this;<a name="line.307"></a>
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
<span class="sourceLineNo">309</span> <a name="line.309"></a>
-<span class="sourceLineNo">310</span> protected ServerManager serverManager;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.311"></a>
+<span class="sourceLineNo">310</span> protected boolean catalogJanitorEnabled;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.311"></a>
<span class="sourceLineNo">312</span> {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> (getImplData()).setServerManager(p_serverManager);<a name="line.313"></a>
+<span class="sourceLineNo">313</span> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.313"></a>
<span class="sourceLineNo">314</span> return this;<a name="line.314"></a>
<span class="sourceLineNo">315</span> }<a name="line.315"></a>
<span class="sourceLineNo">316</span> <a name="line.316"></a>
-<span class="sourceLineNo">317</span> protected Set<ServerName> deadServers;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.318"></a>
+<span class="sourceLineNo">317</span> protected String filter;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.318"></a>
<span class="sourceLineNo">319</span> {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.320"></a>
+<span class="sourceLineNo">320</span> (getImplData()).setFilter(p_filter);<a name="line.320"></a>
<span class="sourceLineNo">321</span> return this;<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> protected List<ServerName> servers;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.325"></a>
+<span class="sourceLineNo">324</span> protected Set<ServerName> deadServers;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.325"></a>
<span class="sourceLineNo">326</span> {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> (getImplData()).setServers(p_servers);<a name="line.327"></a>
+<span class="sourceLineNo">327</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.327"></a>
<span class="sourceLineNo">328</span> return this;<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> protected ServerName metaLocation;<a name="line.331"></a>
-<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.332"></a>
+<span class="sourceLineNo">331</span> protected List<ServerName> servers;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.332"></a>
<span class="sourceLineNo">333</span> {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.334"></a>
+<span class="sourceLineNo">334</span> (getImplData()).setServers(p_servers);<a name="line.334"></a>
<span class="sourceLineNo">335</span> return this;<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>
[12/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html b/testdevapidocs/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
index 037b17c..d5be6a0 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
@@ -95,7 +95,7 @@
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.68">TestFlushSnapshotFromClient</a>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.70">TestFlushSnapshotFromClient</a>
extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">Test creating/using/deleting snapshots from the client
<p>
@@ -122,25 +122,33 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<th class="colLast" scope="col">Field and Description</th>
</tr>
<tr class="altColor">
+<td class="colFirst"><code>protected org.apache.hadoop.hbase.client.Admin</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#admin">admin</a></strong></code> </td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>protected int</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#DEFAULT_NUM_ROWS">DEFAULT_NUM_ROWS</a></strong></code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private static org.apache.commons.logging.Log</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#LOG">LOG</a></strong></code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>protected static int</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#NUM_RS">NUM_RS</a></strong></code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>protected static org.apache.hadoop.hbase.TableName</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#TABLE_NAME">TABLE_NAME</a></strong></code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>protected static byte[]</code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#TEST_FAM">TEST_FAM</a></strong></code> </td>
</tr>
+<tr class="altColor">
+<td class="colFirst"><code>org.junit.rules.TestRule</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#timeout">timeout</a></strong></code> </td>
+</tr>
<tr class="rowColor">
<td class="colFirst"><code>protected static <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#UTIL">UTIL</a></strong></code> </td>
@@ -292,7 +300,16 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>LOG</h4>
-<pre>private static final org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.69">LOG</a></pre>
+<pre>private static final org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.71">LOG</a></pre>
+</li>
+</ul>
+<a name="timeout">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>timeout</h4>
+<pre>public final org.junit.rules.TestRule <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.72">timeout</a></pre>
</li>
</ul>
<a name="UTIL">
@@ -301,7 +318,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>UTIL</h4>
-<pre>protected static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.71">UTIL</a></pre>
+<pre>protected static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.75">UTIL</a></pre>
</li>
</ul>
<a name="NUM_RS">
@@ -310,7 +327,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>NUM_RS</h4>
-<pre>protected static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.72">NUM_RS</a></pre>
+<pre>protected static final int <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.76">NUM_RS</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.snapshot.TestFlushSnapshotFromClient.NUM_RS">Constant Field Values</a></dd></dl>
</li>
</ul>
@@ -320,7 +337,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>TEST_FAM</h4>
-<pre>protected static final byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.73">TEST_FAM</a></pre>
+<pre>protected static final byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.77">TEST_FAM</a></pre>
</li>
</ul>
<a name="TABLE_NAME">
@@ -329,19 +346,28 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>TABLE_NAME</h4>
-<pre>protected static final org.apache.hadoop.hbase.TableName <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.74">TABLE_NAME</a></pre>
+<pre>protected static final org.apache.hadoop.hbase.TableName <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.78">TABLE_NAME</a></pre>
</li>
</ul>
<a name="DEFAULT_NUM_ROWS">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>DEFAULT_NUM_ROWS</h4>
-<pre>protected final int <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.75">DEFAULT_NUM_ROWS</a></pre>
+<pre>protected final int <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.79">DEFAULT_NUM_ROWS</a></pre>
<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.snapshot.TestFlushSnapshotFromClient.DEFAULT_NUM_ROWS">Constant Field Values</a></dd></dl>
</li>
</ul>
+<a name="admin">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>admin</h4>
+<pre>protected org.apache.hadoop.hbase.client.Admin <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.80">admin</a></pre>
+</li>
+</ul>
</li>
</ul>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -356,7 +382,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>TestFlushSnapshotFromClient</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.68">TestFlushSnapshotFromClient</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.70">TestFlushSnapshotFromClient</a>()</pre>
</li>
</ul>
</li>
@@ -373,7 +399,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>setupCluster</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.78">setupCluster</a>()
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.83">setupCluster</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -385,7 +411,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>setupConf</h4>
-<pre>protected static void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.83">setupConf</a>(org.apache.hadoop.conf.Configuration conf)</pre>
+<pre>protected static void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.88">setupConf</a>(org.apache.hadoop.conf.Configuration conf)</pre>
</li>
</ul>
<a name="setup()">
@@ -394,7 +420,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>setup</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.101">setup</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.106">setup</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -406,7 +432,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.105">createTable</a>()
+<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.111">createTable</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -418,7 +444,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>tearDown</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.110">tearDown</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.116">tearDown</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -430,7 +456,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>cleanupTest</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.118">cleanupTest</a>()
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.124">cleanupTest</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -442,7 +468,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testFlushTableSnapshot</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.131">testFlushTableSnapshot</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.137">testFlushTableSnapshot</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Test simple flush snapshotting a table that is online</div>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -455,7 +481,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testSkipFlushTableSnapshot</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.164">testSkipFlushTableSnapshot</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.169">testSkipFlushTableSnapshot</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Test snapshotting a table that is online without flushing</div>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -468,7 +494,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testFlushTableSnapshotWithProcedure</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.204">testFlushTableSnapshotWithProcedure</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.208">testFlushTableSnapshotWithProcedure</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Test simple flush snapshotting a table that is online</div>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -481,7 +507,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testSnapshotFailsOnNonExistantTable</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.238">testSnapshotFailsOnNonExistantTable</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.241">testSnapshotFailsOnNonExistantTable</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -493,7 +519,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testAsyncFlushSnapshot</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.267">testAsyncFlushSnapshot</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.269">testAsyncFlushSnapshot</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -505,7 +531,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testSnapshotStateAfterMerge</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.288">testSnapshotStateAfterMerge</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.289">testSnapshotStateAfterMerge</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -529,7 +555,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testFlushCreateListDestroy</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.386">testFlushCreateListDestroy</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.385">testFlushCreateListDestroy</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Basic end-to-end test of simple-flush-based snapshots</div>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -542,7 +568,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>testConcurrentSnapshottingAttempts</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.407">testConcurrentSnapshottingAttempts</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.405">testConcurrentSnapshottingAttempts</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
<div class="block">Demonstrate that we reject snapshot requests if there is a snapshot already running on the
@@ -559,7 +585,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>waitRegionsAfterMerge</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.506">waitRegionsAfterMerge</a>(long numRegionsAfterMerge)
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.502">waitRegionsAfterMerge</a>(long numRegionsAfterMerge)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -573,7 +599,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockList">
<li class="blockList">
<h4>verifyRowCount</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.522">verifyRowCount</a>(<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> util,
+<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.517">verifyRowCount</a>(<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> util,
org.apache.hadoop.hbase.TableName tableName,
long expectedRows)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -587,7 +613,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<ul class="blockListLast">
<li class="blockList">
<h4>countRows</h4>
-<pre>protected int <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.527">countRows</a>(org.apache.hadoop.hbase.client.Table table,
+<pre>protected int <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.522">countRows</a>(org.apache.hadoop.hbase.client.Table table,
byte[]... families)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
index a009e7c..caa0d78 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
@@ -38,135 +38,140 @@
<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.30"></a>
<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.31"></a>
<span class="sourceLineNo">032</span>import org.junit.Assert;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.junit.Test;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.junit.experimental.categories.Category;<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>/**<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * This tests whether ServerSocketChannel works over ipv6, which Zookeeper<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * depends on. On Windows Oracle JDK 6, creating a ServerSocketChannel throws<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * java.net.SocketException: Address family not supported by protocol family<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * exception. It is a known JVM bug, seems to be only resolved for JDK7:<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * http://bugs.sun.com/view_bug.do?bug_id=6230761<a name="line.41"></a>
-<span class="sourceLineNo">042</span> *<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * For this test, we check that whether we are effected by this bug, and if so<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * the test ensures that we are running with java.net.preferIPv4Stack=true, so<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * that ZK will not fail to bind to ipv6 address using ClientCnxnSocketNIO.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@Category({MiscTests.class, SmallTests.class})<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public class TestIPv6NIOServerSocketChannel {<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> private static final Log LOG = LogFactory.getLog(TestIPv6NIOServerSocketChannel.class);<a name="line.50"></a>
+<span class="sourceLineNo">033</span>import org.junit.Rule;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.junit.Test;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.junit.experimental.categories.Category;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.junit.rules.TestRule;<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>/**<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * This tests whether ServerSocketChannel works over ipv6, which Zookeeper<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * depends on. On Windows Oracle JDK 6, creating a ServerSocketChannel throws<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * java.net.SocketException: Address family not supported by protocol family<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * exception. It is a known JVM bug, seems to be only resolved for JDK7:<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * http://bugs.sun.com/view_bug.do?bug_id=6230761<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * For this test, we check that whether we are effected by this bug, and if so<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * the test ensures that we are running with java.net.preferIPv4Stack=true, so<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * that ZK will not fail to bind to ipv6 address using ClientCnxnSocketNIO.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> */<a name="line.48"></a>
+<span class="sourceLineNo">049</span>@Category({MiscTests.class, SmallTests.class})<a name="line.49"></a>
+<span class="sourceLineNo">050</span>public class TestIPv6NIOServerSocketChannel {<a name="line.50"></a>
<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> /**<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * Creates and binds a regular ServerSocket.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> */<a name="line.54"></a>
-<span class="sourceLineNo">055</span> private void bindServerSocket(InetAddress inetAddr) throws IOException {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> while(true) {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> int port = HBaseTestingUtility.randomFreePort();<a name="line.57"></a>
-<span class="sourceLineNo">058</span> InetSocketAddress addr = new InetSocketAddress(inetAddr, port);<a name="line.58"></a>
-<span class="sourceLineNo">059</span> ServerSocket serverSocket = null;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> try {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> serverSocket = new ServerSocket();<a name="line.61"></a>
-<span class="sourceLineNo">062</span> serverSocket.bind(addr);<a name="line.62"></a>
-<span class="sourceLineNo">063</span> break;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> } catch (BindException ex) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span> //continue<a name="line.65"></a>
-<span class="sourceLineNo">066</span> } finally {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> if (serverSocket != null) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> serverSocket.close();<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> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span> }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> /**<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * Creates a NIO ServerSocketChannel, and gets the ServerSocket from<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * there. Then binds the obtained socket.<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * This fails on Windows with Oracle JDK1.6.0u33, if the passed InetAddress is a<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * IPv6 address. Works on Oracle JDK 1.7.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> */<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private void bindNIOServerSocket(InetAddress inetAddr) throws IOException {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> while (true) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span> int port = HBaseTestingUtility.randomFreePort();<a name="line.82"></a>
-<span class="sourceLineNo">083</span> InetSocketAddress addr = new InetSocketAddress(inetAddr, port);<a name="line.83"></a>
-<span class="sourceLineNo">084</span> ServerSocketChannel channel = null;<a name="line.84"></a>
-<span class="sourceLineNo">085</span> ServerSocket serverSocket = null;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> try {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> channel = ServerSocketChannel.open();<a name="line.87"></a>
-<span class="sourceLineNo">088</span> serverSocket = channel.socket();<a name="line.88"></a>
-<span class="sourceLineNo">089</span> serverSocket.bind(addr); // This does not work<a name="line.89"></a>
-<span class="sourceLineNo">090</span> break;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> } catch (BindException ex) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> //continue<a name="line.92"></a>
-<span class="sourceLineNo">093</span> } finally {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> if (serverSocket != null) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> serverSocket.close();<a name="line.95"></a>
-<span class="sourceLineNo">096</span> }<a name="line.96"></a>
-<span class="sourceLineNo">097</span> if (channel != null) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> channel.close();<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> } <a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span> }<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> * Checks whether we are effected by the JDK issue on windows, and if so<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * ensures that we are running with preferIPv4Stack=true.<a name="line.106"></a>
-<span class="sourceLineNo">107</span> */<a name="line.107"></a>
-<span class="sourceLineNo">108</span> @Test<a name="line.108"></a>
-<span class="sourceLineNo">109</span> public void testServerSocket() throws IOException {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> byte[] addr = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };<a name="line.110"></a>
-<span class="sourceLineNo">111</span> InetAddress inetAddr = InetAddress.getByAddress(addr);<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span> try {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> bindServerSocket(inetAddr);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> bindNIOServerSocket(inetAddr);<a name="line.115"></a>
-<span class="sourceLineNo">116</span> //if on *nix or windows JDK7, both will pass<a name="line.116"></a>
-<span class="sourceLineNo">117</span> } catch(java.net.SocketException ex) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> //On Windows JDK6, we will get expected exception:<a name="line.118"></a>
-<span class="sourceLineNo">119</span> //java.net.SocketException: Address family not supported by protocol family<a name="line.119"></a>
-<span class="sourceLineNo">120</span> //or java.net.SocketException: Protocol family not supported<a name="line.120"></a>
-<span class="sourceLineNo">121</span> Assert.assertFalse(ex.getClass().isInstance(BindException.class));<a name="line.121"></a>
-<span class="sourceLineNo">122</span> Assert.assertTrue(ex.getMessage().toLowerCase().contains("protocol family"));<a name="line.122"></a>
-<span class="sourceLineNo">123</span> LOG.info("Received expected exception:");<a name="line.123"></a>
-<span class="sourceLineNo">124</span> LOG.info(ex);<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> //if this is the case, ensure that we are running on preferIPv4=true<a name="line.126"></a>
-<span class="sourceLineNo">127</span> ensurePreferIPv4();<a name="line.127"></a>
-<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">052</span> private static final Log LOG = LogFactory.getLog(TestIPv6NIOServerSocketChannel.class);<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span> @Rule<a name="line.54"></a>
+<span class="sourceLineNo">055</span> public final TestRule timeout = CategoryBasedTimeout.builder().<a name="line.55"></a>
+<span class="sourceLineNo">056</span> withTimeout(this.getClass()).withLookingForStuckThread(true).build();<a name="line.56"></a>
+<span class="sourceLineNo">057</span> /**<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * Creates and binds a regular ServerSocket.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> */<a name="line.59"></a>
+<span class="sourceLineNo">060</span> private void bindServerSocket(InetAddress inetAddr) throws IOException {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> while(true) {<a name="line.61"></a>
+<span class="sourceLineNo">062</span> int port = HBaseTestingUtility.randomFreePort();<a name="line.62"></a>
+<span class="sourceLineNo">063</span> InetSocketAddress addr = new InetSocketAddress(inetAddr, port);<a name="line.63"></a>
+<span class="sourceLineNo">064</span> ServerSocket serverSocket = null;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> try {<a name="line.65"></a>
+<span class="sourceLineNo">066</span> serverSocket = new ServerSocket();<a name="line.66"></a>
+<span class="sourceLineNo">067</span> serverSocket.bind(addr);<a name="line.67"></a>
+<span class="sourceLineNo">068</span> break;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> } catch (BindException ex) {<a name="line.69"></a>
+<span class="sourceLineNo">070</span> //continue<a name="line.70"></a>
+<span class="sourceLineNo">071</span> } finally {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> if (serverSocket != null) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> serverSocket.close();<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span> }<a name="line.75"></a>
+<span class="sourceLineNo">076</span> }<a name="line.76"></a>
+<span class="sourceLineNo">077</span> }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> /**<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * Creates a NIO ServerSocketChannel, and gets the ServerSocket from<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * there. Then binds the obtained socket.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * This fails on Windows with Oracle JDK1.6.0u33, if the passed InetAddress is a<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * IPv6 address. Works on Oracle JDK 1.7.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> */<a name="line.84"></a>
+<span class="sourceLineNo">085</span> private void bindNIOServerSocket(InetAddress inetAddr) throws IOException {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> while (true) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> int port = HBaseTestingUtility.randomFreePort();<a name="line.87"></a>
+<span class="sourceLineNo">088</span> InetSocketAddress addr = new InetSocketAddress(inetAddr, port);<a name="line.88"></a>
+<span class="sourceLineNo">089</span> ServerSocketChannel channel = null;<a name="line.89"></a>
+<span class="sourceLineNo">090</span> ServerSocket serverSocket = null;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> try {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> channel = ServerSocketChannel.open();<a name="line.92"></a>
+<span class="sourceLineNo">093</span> serverSocket = channel.socket();<a name="line.93"></a>
+<span class="sourceLineNo">094</span> serverSocket.bind(addr); // This does not work<a name="line.94"></a>
+<span class="sourceLineNo">095</span> break;<a name="line.95"></a>
+<span class="sourceLineNo">096</span> } catch (BindException ex) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> //continue<a name="line.97"></a>
+<span class="sourceLineNo">098</span> } finally {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> if (serverSocket != null) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> serverSocket.close();<a name="line.100"></a>
+<span class="sourceLineNo">101</span> }<a name="line.101"></a>
+<span class="sourceLineNo">102</span> if (channel != null) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> channel.close();<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } <a name="line.105"></a>
+<span class="sourceLineNo">106</span> }<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> * Checks whether we are effected by the JDK issue on windows, and if so<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * ensures that we are running with preferIPv4Stack=true.<a name="line.111"></a>
+<span class="sourceLineNo">112</span> */<a name="line.112"></a>
+<span class="sourceLineNo">113</span> @Test<a name="line.113"></a>
+<span class="sourceLineNo">114</span> public void testServerSocket() throws IOException {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> byte[] addr = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };<a name="line.115"></a>
+<span class="sourceLineNo">116</span> InetAddress inetAddr = InetAddress.getByAddress(addr);<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> try {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> bindServerSocket(inetAddr);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> bindNIOServerSocket(inetAddr);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> //if on *nix or windows JDK7, both will pass<a name="line.121"></a>
+<span class="sourceLineNo">122</span> } catch(java.net.SocketException ex) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> //On Windows JDK6, we will get expected exception:<a name="line.123"></a>
+<span class="sourceLineNo">124</span> //java.net.SocketException: Address family not supported by protocol family<a name="line.124"></a>
+<span class="sourceLineNo">125</span> //or java.net.SocketException: Protocol family not supported<a name="line.125"></a>
+<span class="sourceLineNo">126</span> Assert.assertFalse(ex.getClass().isInstance(BindException.class));<a name="line.126"></a>
+<span class="sourceLineNo">127</span> Assert.assertTrue(ex.getMessage().toLowerCase().contains("protocol family"));<a name="line.127"></a>
+<span class="sourceLineNo">128</span> LOG.info("Received expected exception:");<a name="line.128"></a>
+<span class="sourceLineNo">129</span> LOG.info(ex);<a name="line.129"></a>
<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> /**<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * Checks whether we are running with java.net.preferIPv4Stack=true<a name="line.132"></a>
-<span class="sourceLineNo">133</span> */<a name="line.133"></a>
-<span class="sourceLineNo">134</span> public void ensurePreferIPv4() throws IOException {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> InetAddress[] addrs = InetAddress.getAllByName("localhost");<a name="line.135"></a>
-<span class="sourceLineNo">136</span> for (InetAddress addr : addrs) {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> LOG.info("resolved localhost as:" + addr);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> Assert.assertEquals(4, addr.getAddress().length); //ensure 4 byte ipv4 address<a name="line.138"></a>
-<span class="sourceLineNo">139</span> }<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> /**<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * Tests whether every InetAddress we obtain by resolving can open a<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * ServerSocketChannel.<a name="line.144"></a>
-<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> @Test<a name="line.146"></a>
-<span class="sourceLineNo">147</span> public void testServerSocketFromLocalhostResolution() throws IOException {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> InetAddress[] addrs = InetAddress.getAllByName("localhost");<a name="line.148"></a>
-<span class="sourceLineNo">149</span> for (InetAddress addr : addrs) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> LOG.info("resolved localhost as:" + addr);<a name="line.150"></a>
-<span class="sourceLineNo">151</span> bindServerSocket(addr);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> bindNIOServerSocket(addr);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> public static void main(String[] args) throws Exception {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> TestIPv6NIOServerSocketChannel test = new TestIPv6NIOServerSocketChannel();<a name="line.157"></a>
-<span class="sourceLineNo">158</span> test.testServerSocket();<a name="line.158"></a>
-<span class="sourceLineNo">159</span> test.testServerSocketFromLocalhostResolution();<a name="line.159"></a>
-<span class="sourceLineNo">160</span> }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>}<a name="line.161"></a>
+<span class="sourceLineNo">131</span> //if this is the case, ensure that we are running on preferIPv4=true<a name="line.131"></a>
+<span class="sourceLineNo">132</span> ensurePreferIPv4();<a name="line.132"></a>
+<span class="sourceLineNo">133</span> }<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * Checks whether we are running with java.net.preferIPv4Stack=true<a name="line.137"></a>
+<span class="sourceLineNo">138</span> */<a name="line.138"></a>
+<span class="sourceLineNo">139</span> public void ensurePreferIPv4() throws IOException {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> InetAddress[] addrs = InetAddress.getAllByName("localhost");<a name="line.140"></a>
+<span class="sourceLineNo">141</span> for (InetAddress addr : addrs) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> LOG.info("resolved localhost as:" + addr);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> Assert.assertEquals(4, addr.getAddress().length); //ensure 4 byte ipv4 address<a name="line.143"></a>
+<span class="sourceLineNo">144</span> }<a name="line.144"></a>
+<span class="sourceLineNo">145</span> }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> /**<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * Tests whether every InetAddress we obtain by resolving can open a<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * ServerSocketChannel.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> */<a name="line.150"></a>
+<span class="sourceLineNo">151</span> @Test<a name="line.151"></a>
+<span class="sourceLineNo">152</span> public void testServerSocketFromLocalhostResolution() throws IOException {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> InetAddress[] addrs = InetAddress.getAllByName("localhost");<a name="line.153"></a>
+<span class="sourceLineNo">154</span> for (InetAddress addr : addrs) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> LOG.info("resolved localhost as:" + addr);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> bindServerSocket(addr);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> bindNIOServerSocket(addr);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> public static void main(String[] args) throws Exception {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> TestIPv6NIOServerSocketChannel test = new TestIPv6NIOServerSocketChannel();<a name="line.162"></a>
+<span class="sourceLineNo">163</span> test.testServerSocket();<a name="line.163"></a>
+<span class="sourceLineNo">164</span> test.testServerSocketFromLocalhostResolution();<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span>}<a name="line.166"></a>
[06/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/xref-test/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html b/xref-test/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
index 99a0a46..fb03c1b 100644
--- a/xref-test/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
+++ b/xref-test/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html
@@ -44,518 +44,522 @@
<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.conf.Configuration;
<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.fs.FileSystem;
<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.fs.Path;
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.CoordinatedStateManager;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HBaseTestingUtility;
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HColumnDescriptor;
-<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HConstants;
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HRegionInfo;
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HTableDescriptor;
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.MetaTableAccessor;
-<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.MiniHBaseCluster;
-<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.ServerName;
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableName;
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.UnknownRegionException;
-<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Admin;
-<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.RegionReplicaUtil;
-<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
-<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
-<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
-<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Table;
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.exceptions.MergeRegionException;
-<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.AssignmentManager;
-<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.HMaster;
-<a class="jxr_linenumber" name="58" href="#58">58</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.MasterRpcServices;
-<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.RegionState;
-<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.RegionState.State;
-<a class="jxr_linenumber" name="61" href="#61">61</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.RegionStates;
-<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;
-<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest;
-<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse;
-<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.testclassification.LargeTests;
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.testclassification.RegionServerTests;
-<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
-<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.FSUtils;
-<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
-<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Pair;
-<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.PairOfSameType;
-<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.util.StringUtils;
-<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">import</strong> org.apache.zookeeper.KeeperException;
-<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">import</strong> org.junit.AfterClass;
-<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">import</strong> org.junit.BeforeClass;
-<a class="jxr_linenumber" name="77" href="#77">77</a> <strong class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="78" href="#78">78</a> <strong class="jxr_keyword">import</strong> org.junit.experimental.categories.Category;
-<a class="jxr_linenumber" name="79" href="#79">79</a>
-<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">import</strong> com.google.common.base.Joiner;
-<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">import</strong> com.google.protobuf.RpcController;
-<a class="jxr_linenumber" name="82" href="#82">82</a> <strong class="jxr_keyword">import</strong> com.google.protobuf.ServiceException;
-<a class="jxr_linenumber" name="83" href="#83">83</a>
-<a class="jxr_linenumber" name="84" href="#84">84</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="85" href="#85">85</a> <em class="jxr_javadoccomment"> * Like {@link TestRegionMergeTransaction} in that we're testing</em>
-<a class="jxr_linenumber" name="86" href="#86">86</a> <em class="jxr_javadoccomment"> * {@link RegionMergeTransactionImpl} only the below tests are against a running</em>
-<a class="jxr_linenumber" name="87" href="#87">87</a> <em class="jxr_javadoccomment"> * cluster where {@link TestRegionMergeTransaction} is tests against bare</em>
-<a class="jxr_linenumber" name="88" href="#88">88</a> <em class="jxr_javadoccomment"> * {@link HRegion}.</em>
-<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a> @Category({RegionServerTests.<strong class="jxr_keyword">class</strong>, LargeTests.<strong class="jxr_keyword">class</strong>})
-<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html">TestRegionMergeTransactionOnCluster</a> {
-<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory
-<a class="jxr_linenumber" name="93" href="#93">93</a> .getLog(TestRegionMergeTransactionOnCluster.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NB_SERVERS = 3;
-<a class="jxr_linenumber" name="95" href="#95">95</a>
-<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] FAMILYNAME = Bytes.toBytes(<span class="jxr_string">"fam"</span>);
-<a class="jxr_linenumber" name="97" href="#97">97</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] QUALIFIER = Bytes.toBytes(<span class="jxr_string">"q"</span>);
-<a class="jxr_linenumber" name="98" href="#98">98</a>
-<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> byte[] ROW = Bytes.toBytes(<span class="jxr_string">"testRow"</span>);
-<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> INITIAL_REGION_NUM = 10;
-<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ROWSIZE = 200;
-<a class="jxr_linenumber" name="102" href="#102">102</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> byte[][] ROWS = makeN(ROW, ROWSIZE);
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.CategoryBasedTimeout;
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.CoordinatedStateManager;
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HBaseTestingUtility;
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HColumnDescriptor;
+<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HConstants;
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HRegionInfo;
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.HTableDescriptor;
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.MetaTableAccessor;
+<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.MiniHBaseCluster;
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.ServerName;
+<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableName;
+<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.UnknownRegionException;
+<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Admin;
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.RegionReplicaUtil;
+<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.ResultScanner;
+<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Scan;
+<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Table;
+<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.exceptions.MergeRegionException;
+<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.AssignmentManager;
+<a class="jxr_linenumber" name="58" href="#58">58</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.HMaster;
+<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.MasterRpcServices;
+<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.RegionState;
+<a class="jxr_linenumber" name="61" href="#61">61</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.RegionState.State;
+<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.master.RegionStates;
+<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;
+<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest;
+<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse;
+<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.testclassification.LargeTests;
+<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.testclassification.RegionServerTests;
+<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
+<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.FSUtils;
+<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
+<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Pair;
+<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.PairOfSameType;
+<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.util.StringUtils;
+<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">import</strong> org.apache.zookeeper.KeeperException;
+<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">import</strong> org.junit.AfterClass;
+<a class="jxr_linenumber" name="77" href="#77">77</a> <strong class="jxr_keyword">import</strong> org.junit.BeforeClass;
+<a class="jxr_linenumber" name="78" href="#78">78</a> <strong class="jxr_keyword">import</strong> org.junit.Rule;
+<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">import</strong> org.junit.experimental.categories.Category;
+<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">import</strong> org.junit.rules.TestRule;
+<a class="jxr_linenumber" name="82" href="#82">82</a>
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">import</strong> com.google.common.base.Joiner;
+<a class="jxr_linenumber" name="84" href="#84">84</a> <strong class="jxr_keyword">import</strong> com.google.protobuf.RpcController;
+<a class="jxr_linenumber" name="85" href="#85">85</a> <strong class="jxr_keyword">import</strong> com.google.protobuf.ServiceException;
+<a class="jxr_linenumber" name="86" href="#86">86</a>
+<a class="jxr_linenumber" name="87" href="#87">87</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="88" href="#88">88</a> <em class="jxr_javadoccomment"> * Like {@link TestRegionMergeTransaction} in that we're testing</em>
+<a class="jxr_linenumber" name="89" href="#89">89</a> <em class="jxr_javadoccomment"> * {@link RegionMergeTransactionImpl} only the below tests are against a running</em>
+<a class="jxr_linenumber" name="90" href="#90">90</a> <em class="jxr_javadoccomment"> * cluster where {@link TestRegionMergeTransaction} is tests against bare</em>
+<a class="jxr_linenumber" name="91" href="#91">91</a> <em class="jxr_javadoccomment"> * {@link HRegion}.</em>
+<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="93" href="#93">93</a> @Category({RegionServerTests.<strong class="jxr_keyword">class</strong>, LargeTests.<strong class="jxr_keyword">class</strong>})
+<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html">TestRegionMergeTransactionOnCluster</a> {
+<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory
+<a class="jxr_linenumber" name="96" href="#96">96</a> .getLog(TestRegionMergeTransactionOnCluster.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="97" href="#97">97</a> @Rule <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> TestRule timeout = CategoryBasedTimeout.builder().withTimeout(<strong class="jxr_keyword">this</strong>.getClass()).
+<a class="jxr_linenumber" name="98" href="#98">98</a> withLookingForStuckThread(<strong class="jxr_keyword">true</strong>).build();
+<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> NB_SERVERS = 3;
+<a class="jxr_linenumber" name="100" href="#100">100</a>
+<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] FAMILYNAME = Bytes.toBytes(<span class="jxr_string">"fam"</span>);
+<a class="jxr_linenumber" name="102" href="#102">102</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] QUALIFIER = Bytes.toBytes(<span class="jxr_string">"q"</span>);
<a class="jxr_linenumber" name="103" href="#103">103</a>
-<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">int</strong> waitTime = 60 * 1000;
-<a class="jxr_linenumber" name="105" href="#105">105</a>
-<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html">HBaseTestingUtility</a> TEST_UTIL = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html">HBaseTestingUtility</a>();
-<a class="jxr_linenumber" name="107" href="#107">107</a>
-<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> HMaster master;
-<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Admin admin;
+<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> byte[] ROW = Bytes.toBytes(<span class="jxr_string">"testRow"</span>);
+<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> INITIAL_REGION_NUM = 10;
+<a class="jxr_linenumber" name="106" href="#106">106</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> ROWSIZE = 200;
+<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> byte[][] ROWS = makeN(ROW, ROWSIZE);
+<a class="jxr_linenumber" name="108" href="#108">108</a>
+<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">int</strong> waitTime = 60 * 1000;
<a class="jxr_linenumber" name="110" href="#110">110</a>
-<a class="jxr_linenumber" name="111" href="#111">111</a> @BeforeClass
-<a class="jxr_linenumber" name="112" href="#112">112</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> beforeAllTests() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="113" href="#113">113</a> <em class="jxr_comment">// Start a cluster</em>
-<a class="jxr_linenumber" name="114" href="#114">114</a> TEST_UTIL.startMiniCluster(1, NB_SERVERS, <strong class="jxr_keyword">null</strong>, MyMaster.<strong class="jxr_keyword">class</strong>, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="115" href="#115">115</a> <a href="../../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html">MiniHBaseCluster</a> cluster = TEST_UTIL.getHBaseCluster();
-<a class="jxr_linenumber" name="116" href="#116">116</a> master = cluster.getMaster();
-<a class="jxr_linenumber" name="117" href="#117">117</a> master.balanceSwitch(false);
-<a class="jxr_linenumber" name="118" href="#118">118</a> admin = TEST_UTIL.getHBaseAdmin();
-<a class="jxr_linenumber" name="119" href="#119">119</a> }
-<a class="jxr_linenumber" name="120" href="#120">120</a>
-<a class="jxr_linenumber" name="121" href="#121">121</a> @AfterClass
-<a class="jxr_linenumber" name="122" href="#122">122</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> afterAllTests() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="123" href="#123">123</a> TEST_UTIL.shutdownMiniCluster();
+<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html">HBaseTestingUtility</a> TEST_UTIL = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html">HBaseTestingUtility</a>();
+<a class="jxr_linenumber" name="112" href="#112">112</a>
+<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> HMaster MASTER;
+<a class="jxr_linenumber" name="114" href="#114">114</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Admin ADMIN;
+<a class="jxr_linenumber" name="115" href="#115">115</a>
+<a class="jxr_linenumber" name="116" href="#116">116</a> @BeforeClass
+<a class="jxr_linenumber" name="117" href="#117">117</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> beforeAllTests() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="118" href="#118">118</a> <em class="jxr_comment">// Start a cluster</em>
+<a class="jxr_linenumber" name="119" href="#119">119</a> TEST_UTIL.startMiniCluster(1, NB_SERVERS, <strong class="jxr_keyword">null</strong>, MyMaster.<strong class="jxr_keyword">class</strong>, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="120" href="#120">120</a> <a href="../../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html">MiniHBaseCluster</a> cluster = TEST_UTIL.getHBaseCluster();
+<a class="jxr_linenumber" name="121" href="#121">121</a> MASTER = cluster.getMaster();
+<a class="jxr_linenumber" name="122" href="#122">122</a> MASTER.balanceSwitch(false);
+<a class="jxr_linenumber" name="123" href="#123">123</a> ADMIN = TEST_UTIL.getConnection().getAdmin();
<a class="jxr_linenumber" name="124" href="#124">124</a> }
<a class="jxr_linenumber" name="125" href="#125">125</a>
-<a class="jxr_linenumber" name="126" href="#126">126</a> @Test
-<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testWholesomeMerge() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="128" href="#128">128</a> LOG.info(<span class="jxr_string">"Starting testWholesomeMerge"</span>);
-<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">final</strong> TableName tableName =
-<a class="jxr_linenumber" name="130" href="#130">130</a> TableName.valueOf(<span class="jxr_string">"testWholesomeMerge"</span>);
+<a class="jxr_linenumber" name="126" href="#126">126</a> @AfterClass
+<a class="jxr_linenumber" name="127" href="#127">127</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> afterAllTests() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="128" href="#128">128</a> TEST_UTIL.shutdownMiniCluster();
+<a class="jxr_linenumber" name="129" href="#129">129</a> <strong class="jxr_keyword">if</strong> (ADMIN != <strong class="jxr_keyword">null</strong>) ADMIN.close();
+<a class="jxr_linenumber" name="130" href="#130">130</a> }
<a class="jxr_linenumber" name="131" href="#131">131</a>
-<a class="jxr_linenumber" name="132" href="#132">132</a> <em class="jxr_comment">// Create table and load data.</em>
-<a class="jxr_linenumber" name="133" href="#133">133</a> Table table = createTableAndLoadData(master, tableName);
-<a class="jxr_linenumber" name="134" href="#134">134</a> <em class="jxr_comment">// Merge 1st and 2nd region</em>
-<a class="jxr_linenumber" name="135" href="#135">135</a> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,
-<a class="jxr_linenumber" name="136" href="#136">136</a> INITIAL_REGION_NUM - 1);
+<a class="jxr_linenumber" name="132" href="#132">132</a> @Test
+<a class="jxr_linenumber" name="133" href="#133">133</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testWholesomeMerge() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="134" href="#134">134</a> LOG.info(<span class="jxr_string">"Starting testWholesomeMerge"</span>);
+<a class="jxr_linenumber" name="135" href="#135">135</a> <strong class="jxr_keyword">final</strong> TableName tableName =
+<a class="jxr_linenumber" name="136" href="#136">136</a> TableName.valueOf(<span class="jxr_string">"testWholesomeMerge"</span>);
<a class="jxr_linenumber" name="137" href="#137">137</a>
-<a class="jxr_linenumber" name="138" href="#138">138</a> <em class="jxr_comment">// Merge 2nd and 3th region</em>
-<a class="jxr_linenumber" name="139" href="#139">139</a> PairOfSameType<HRegionInfo> mergedRegions =
-<a class="jxr_linenumber" name="140" href="#140">140</a> mergeRegionsAndVerifyRegionNum(master, tableName, 1, 2,
-<a class="jxr_linenumber" name="141" href="#141">141</a> INITIAL_REGION_NUM - 2);
-<a class="jxr_linenumber" name="142" href="#142">142</a>
-<a class="jxr_linenumber" name="143" href="#143">143</a> verifyRowCount(table, ROWSIZE);
-<a class="jxr_linenumber" name="144" href="#144">144</a>
-<a class="jxr_linenumber" name="145" href="#145">145</a> <em class="jxr_comment">// Randomly choose one of the two merged regions</em>
-<a class="jxr_linenumber" name="146" href="#146">146</a> HRegionInfo hri = RandomUtils.nextBoolean() ?
-<a class="jxr_linenumber" name="147" href="#147">147</a> mergedRegions.getFirst() : mergedRegions.getSecond();
-<a class="jxr_linenumber" name="148" href="#148">148</a> <a href="../../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html">MiniHBaseCluster</a> cluster = TEST_UTIL.getHBaseCluster();
-<a class="jxr_linenumber" name="149" href="#149">149</a> AssignmentManager am = cluster.getMaster().getAssignmentManager();
-<a class="jxr_linenumber" name="150" href="#150">150</a> RegionStates regionStates = am.getRegionStates();
-<a class="jxr_linenumber" name="151" href="#151">151</a> <strong class="jxr_keyword">long</strong> start = EnvironmentEdgeManager.currentTime();
-<a class="jxr_linenumber" name="152" href="#152">152</a> <strong class="jxr_keyword">while</strong> (!regionStates.isRegionInState(hri, State.MERGED)) {
-<a class="jxr_linenumber" name="153" href="#153">153</a> assertFalse(<span class="jxr_string">"Timed out in waiting one merged region to be in state MERGED"</span>,
-<a class="jxr_linenumber" name="154" href="#154">154</a> EnvironmentEdgeManager.currentTime() - start > 60000);
-<a class="jxr_linenumber" name="155" href="#155">155</a> Thread.sleep(500);
-<a class="jxr_linenumber" name="156" href="#156">156</a> }
-<a class="jxr_linenumber" name="157" href="#157">157</a>
-<a class="jxr_linenumber" name="158" href="#158">158</a> <em class="jxr_comment">// We should not be able to assign it again</em>
-<a class="jxr_linenumber" name="159" href="#159">159</a> am.assign(hri, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="160" href="#160">160</a> assertFalse(<span class="jxr_string">"Merged region can't be assigned"</span>,
-<a class="jxr_linenumber" name="161" href="#161">161</a> regionStates.isRegionInTransition(hri));
-<a class="jxr_linenumber" name="162" href="#162">162</a> assertTrue(regionStates.isRegionInState(hri, State.MERGED));
+<a class="jxr_linenumber" name="138" href="#138">138</a> <em class="jxr_comment">// Create table and load data.</em>
+<a class="jxr_linenumber" name="139" href="#139">139</a> Table table = createTableAndLoadData(MASTER, tableName);
+<a class="jxr_linenumber" name="140" href="#140">140</a> <em class="jxr_comment">// Merge 1st and 2nd region</em>
+<a class="jxr_linenumber" name="141" href="#141">141</a> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1,
+<a class="jxr_linenumber" name="142" href="#142">142</a> INITIAL_REGION_NUM - 1);
+<a class="jxr_linenumber" name="143" href="#143">143</a>
+<a class="jxr_linenumber" name="144" href="#144">144</a> <em class="jxr_comment">// Merge 2nd and 3th region</em>
+<a class="jxr_linenumber" name="145" href="#145">145</a> PairOfSameType<HRegionInfo> mergedRegions =
+<a class="jxr_linenumber" name="146" href="#146">146</a> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 1, 2,
+<a class="jxr_linenumber" name="147" href="#147">147</a> INITIAL_REGION_NUM - 2);
+<a class="jxr_linenumber" name="148" href="#148">148</a>
+<a class="jxr_linenumber" name="149" href="#149">149</a> verifyRowCount(table, ROWSIZE);
+<a class="jxr_linenumber" name="150" href="#150">150</a>
+<a class="jxr_linenumber" name="151" href="#151">151</a> <em class="jxr_comment">// Randomly choose one of the two merged regions</em>
+<a class="jxr_linenumber" name="152" href="#152">152</a> HRegionInfo hri = RandomUtils.nextBoolean() ?
+<a class="jxr_linenumber" name="153" href="#153">153</a> mergedRegions.getFirst() : mergedRegions.getSecond();
+<a class="jxr_linenumber" name="154" href="#154">154</a> <a href="../../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html">MiniHBaseCluster</a> cluster = TEST_UTIL.getHBaseCluster();
+<a class="jxr_linenumber" name="155" href="#155">155</a> AssignmentManager am = cluster.getMaster().getAssignmentManager();
+<a class="jxr_linenumber" name="156" href="#156">156</a> RegionStates regionStates = am.getRegionStates();
+<a class="jxr_linenumber" name="157" href="#157">157</a> <strong class="jxr_keyword">long</strong> start = EnvironmentEdgeManager.currentTime();
+<a class="jxr_linenumber" name="158" href="#158">158</a> <strong class="jxr_keyword">while</strong> (!regionStates.isRegionInState(hri, State.MERGED)) {
+<a class="jxr_linenumber" name="159" href="#159">159</a> assertFalse(<span class="jxr_string">"Timed out in waiting one merged region to be in state MERGED"</span>,
+<a class="jxr_linenumber" name="160" href="#160">160</a> EnvironmentEdgeManager.currentTime() - start > 60000);
+<a class="jxr_linenumber" name="161" href="#161">161</a> Thread.sleep(500);
+<a class="jxr_linenumber" name="162" href="#162">162</a> }
<a class="jxr_linenumber" name="163" href="#163">163</a>
-<a class="jxr_linenumber" name="164" href="#164">164</a> <em class="jxr_comment">// We should not be able to unassign it either</em>
-<a class="jxr_linenumber" name="165" href="#165">165</a> am.unassign(hri, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="166" href="#166">166</a> assertFalse(<span class="jxr_string">"Merged region can't be unassigned"</span>,
+<a class="jxr_linenumber" name="164" href="#164">164</a> <em class="jxr_comment">// We should not be able to assign it again</em>
+<a class="jxr_linenumber" name="165" href="#165">165</a> am.assign(hri, <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="166" href="#166">166</a> assertFalse(<span class="jxr_string">"Merged region can't be assigned"</span>,
<a class="jxr_linenumber" name="167" href="#167">167</a> regionStates.isRegionInTransition(hri));
<a class="jxr_linenumber" name="168" href="#168">168</a> assertTrue(regionStates.isRegionInState(hri, State.MERGED));
<a class="jxr_linenumber" name="169" href="#169">169</a>
-<a class="jxr_linenumber" name="170" href="#170">170</a> table.close();
-<a class="jxr_linenumber" name="171" href="#171">171</a> }
-<a class="jxr_linenumber" name="172" href="#172">172</a>
-<a class="jxr_linenumber" name="173" href="#173">173</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="174" href="#174">174</a> <em class="jxr_javadoccomment"> * Not really restarting the master. Simulate it by clear of new region</em>
-<a class="jxr_linenumber" name="175" href="#175">175</a> <em class="jxr_javadoccomment"> * state since it is not persisted, will be lost after master restarts.</em>
-<a class="jxr_linenumber" name="176" href="#176">176</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="177" href="#177">177</a> @Test
-<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMergeAndRestartingMaster() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="179" href="#179">179</a> LOG.info(<span class="jxr_string">"Starting testMergeAndRestartingMaster"</span>);
-<a class="jxr_linenumber" name="180" href="#180">180</a> <strong class="jxr_keyword">final</strong> TableName tableName = TableName.valueOf(<span class="jxr_string">"testMergeAndRestartingMaster"</span>);
-<a class="jxr_linenumber" name="181" href="#181">181</a>
-<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_comment">// Create table and load data.</em>
-<a class="jxr_linenumber" name="183" href="#183">183</a> Table table = createTableAndLoadData(master, tableName);
-<a class="jxr_linenumber" name="184" href="#184">184</a>
-<a class="jxr_linenumber" name="185" href="#185">185</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="186" href="#186">186</a> MyMasterRpcServices.enabled.set(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="170" href="#170">170</a> <em class="jxr_comment">// We should not be able to unassign it either</em>
+<a class="jxr_linenumber" name="171" href="#171">171</a> am.unassign(hri, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="172" href="#172">172</a> assertFalse(<span class="jxr_string">"Merged region can't be unassigned"</span>,
+<a class="jxr_linenumber" name="173" href="#173">173</a> regionStates.isRegionInTransition(hri));
+<a class="jxr_linenumber" name="174" href="#174">174</a> assertTrue(regionStates.isRegionInState(hri, State.MERGED));
+<a class="jxr_linenumber" name="175" href="#175">175</a>
+<a class="jxr_linenumber" name="176" href="#176">176</a> table.close();
+<a class="jxr_linenumber" name="177" href="#177">177</a> }
+<a class="jxr_linenumber" name="178" href="#178">178</a>
+<a class="jxr_linenumber" name="179" href="#179">179</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="180" href="#180">180</a> <em class="jxr_javadoccomment"> * Not really restarting the master. Simulate it by clear of new region</em>
+<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_javadoccomment"> * state since it is not persisted, will be lost after master restarts.</em>
+<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="183" href="#183">183</a> @Test
+<a class="jxr_linenumber" name="184" href="#184">184</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMergeAndRestartingMaster() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="185" href="#185">185</a> LOG.info(<span class="jxr_string">"Starting testMergeAndRestartingMaster"</span>);
+<a class="jxr_linenumber" name="186" href="#186">186</a> <strong class="jxr_keyword">final</strong> TableName tableName = TableName.valueOf(<span class="jxr_string">"testMergeAndRestartingMaster"</span>);
<a class="jxr_linenumber" name="187" href="#187">187</a>
-<a class="jxr_linenumber" name="188" href="#188">188</a> <em class="jxr_comment">// Merge 1st and 2nd region</em>
-<a class="jxr_linenumber" name="189" href="#189">189</a> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,
-<a class="jxr_linenumber" name="190" href="#190">190</a> INITIAL_REGION_NUM - 1);
-<a class="jxr_linenumber" name="191" href="#191">191</a> } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="192" href="#192">192</a> MyMasterRpcServices.enabled.set(false);
-<a class="jxr_linenumber" name="193" href="#193">193</a> }
-<a class="jxr_linenumber" name="194" href="#194">194</a>
-<a class="jxr_linenumber" name="195" href="#195">195</a> table.close();
-<a class="jxr_linenumber" name="196" href="#196">196</a> }
-<a class="jxr_linenumber" name="197" href="#197">197</a>
-<a class="jxr_linenumber" name="198" href="#198">198</a> @SuppressWarnings(<span class="jxr_string">"deprecation"</span>)
-<a class="jxr_linenumber" name="199" href="#199">199</a> @Test
-<a class="jxr_linenumber" name="200" href="#200">200</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCleanMergeReference() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="201" href="#201">201</a> LOG.info(<span class="jxr_string">"Starting testCleanMergeReference"</span>);
-<a class="jxr_linenumber" name="202" href="#202">202</a> admin.enableCatalogJanitor(false);
-<a class="jxr_linenumber" name="203" href="#203">203</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="204" href="#204">204</a> <strong class="jxr_keyword">final</strong> TableName tableName =
-<a class="jxr_linenumber" name="205" href="#205">205</a> TableName.valueOf(<span class="jxr_string">"testCleanMergeReference"</span>);
-<a class="jxr_linenumber" name="206" href="#206">206</a> <em class="jxr_comment">// Create table and load data.</em>
-<a class="jxr_linenumber" name="207" href="#207">207</a> Table table = createTableAndLoadData(master, tableName);
-<a class="jxr_linenumber" name="208" href="#208">208</a> <em class="jxr_comment">// Merge 1st and 2nd region</em>
-<a class="jxr_linenumber" name="209" href="#209">209</a> mergeRegionsAndVerifyRegionNum(master, tableName, 0, 1,
-<a class="jxr_linenumber" name="210" href="#210">210</a> INITIAL_REGION_NUM - 1);
-<a class="jxr_linenumber" name="211" href="#211">211</a> verifyRowCount(table, ROWSIZE);
-<a class="jxr_linenumber" name="212" href="#212">212</a> table.close();
-<a class="jxr_linenumber" name="213" href="#213">213</a>
-<a class="jxr_linenumber" name="214" href="#214">214</a> List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor
-<a class="jxr_linenumber" name="215" href="#215">215</a> .getTableRegionsAndLocations(master.getConnection(), tableName);
-<a class="jxr_linenumber" name="216" href="#216">216</a> HRegionInfo mergedRegionInfo = tableRegions.get(0).getFirst();
-<a class="jxr_linenumber" name="217" href="#217">217</a> HTableDescriptor tableDescriptor = master.getTableDescriptors().get(
-<a class="jxr_linenumber" name="218" href="#218">218</a> tableName);
-<a class="jxr_linenumber" name="219" href="#219">219</a> Result mergedRegionResult = MetaTableAccessor.getRegionResult(
-<a class="jxr_linenumber" name="220" href="#220">220</a> master.getConnection(), mergedRegionInfo.getRegionName());
-<a class="jxr_linenumber" name="221" href="#221">221</a>
-<a class="jxr_linenumber" name="222" href="#222">222</a> <em class="jxr_comment">// contains merge reference in META</em>
-<a class="jxr_linenumber" name="223" href="#223">223</a> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,
-<a class="jxr_linenumber" name="224" href="#224">224</a> HConstants.MERGEA_QUALIFIER) != <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="225" href="#225">225</a> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,
-<a class="jxr_linenumber" name="226" href="#226">226</a> HConstants.MERGEB_QUALIFIER) != <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="227" href="#227">227</a>
-<a class="jxr_linenumber" name="228" href="#228">228</a> <em class="jxr_comment">// merging regions' directory are in the file system all the same</em>
-<a class="jxr_linenumber" name="229" href="#229">229</a> PairOfSameType<HRegionInfo> p = MetaTableAccessor.getMergeRegions(mergedRegionResult);
-<a class="jxr_linenumber" name="230" href="#230">230</a> HRegionInfo regionA = p.getFirst();
-<a class="jxr_linenumber" name="231" href="#231">231</a> HRegionInfo regionB = p.getSecond();
-<a class="jxr_linenumber" name="232" href="#232">232</a> FileSystem fs = master.getMasterFileSystem().getFileSystem();
-<a class="jxr_linenumber" name="233" href="#233">233</a> Path rootDir = master.getMasterFileSystem().getRootDir();
-<a class="jxr_linenumber" name="234" href="#234">234</a>
-<a class="jxr_linenumber" name="235" href="#235">235</a> Path tabledir = FSUtils.getTableDir(rootDir, mergedRegionInfo.getTable());
-<a class="jxr_linenumber" name="236" href="#236">236</a> Path regionAdir = <strong class="jxr_keyword">new</strong> Path(tabledir, regionA.getEncodedName());
-<a class="jxr_linenumber" name="237" href="#237">237</a> Path regionBdir = <strong class="jxr_keyword">new</strong> Path(tabledir, regionB.getEncodedName());
-<a class="jxr_linenumber" name="238" href="#238">238</a> assertTrue(fs.exists(regionAdir));
-<a class="jxr_linenumber" name="239" href="#239">239</a> assertTrue(fs.exists(regionBdir));
-<a class="jxr_linenumber" name="240" href="#240">240</a>
-<a class="jxr_linenumber" name="241" href="#241">241</a> HColumnDescriptor[] columnFamilies = tableDescriptor.getColumnFamilies();
-<a class="jxr_linenumber" name="242" href="#242">242</a> HRegionFileSystem hrfs = <strong class="jxr_keyword">new</strong> HRegionFileSystem(
-<a class="jxr_linenumber" name="243" href="#243">243</a> TEST_UTIL.getConfiguration(), fs, tabledir, mergedRegionInfo);
-<a class="jxr_linenumber" name="244" href="#244">244</a> <strong class="jxr_keyword">int</strong> count = 0;
-<a class="jxr_linenumber" name="245" href="#245">245</a> <strong class="jxr_keyword">for</strong>(HColumnDescriptor colFamily : columnFamilies) {
-<a class="jxr_linenumber" name="246" href="#246">246</a> count += hrfs.getStoreFiles(colFamily.getName()).size();
-<a class="jxr_linenumber" name="247" href="#247">247</a> }
-<a class="jxr_linenumber" name="248" href="#248">248</a> admin.compactRegion(mergedRegionInfo.getRegionName());
-<a class="jxr_linenumber" name="249" href="#249">249</a> <em class="jxr_comment">// clean up the merged region store files</em>
-<a class="jxr_linenumber" name="250" href="#250">250</a> <em class="jxr_comment">// wait until merged region have reference file</em>
-<a class="jxr_linenumber" name="251" href="#251">251</a> <strong class="jxr_keyword">long</strong> timeout = System.currentTimeMillis() + waitTime;
-<a class="jxr_linenumber" name="252" href="#252">252</a> <strong class="jxr_keyword">int</strong> newcount = 0;
-<a class="jxr_linenumber" name="253" href="#253">253</a> <strong class="jxr_keyword">while</strong> (System.currentTimeMillis() < timeout) {
-<a class="jxr_linenumber" name="254" href="#254">254</a> <strong class="jxr_keyword">for</strong>(HColumnDescriptor colFamily : columnFamilies) {
-<a class="jxr_linenumber" name="255" href="#255">255</a> newcount += hrfs.getStoreFiles(colFamily.getName()).size();
-<a class="jxr_linenumber" name="256" href="#256">256</a> }
-<a class="jxr_linenumber" name="257" href="#257">257</a> <strong class="jxr_keyword">if</strong>(newcount > count) {
-<a class="jxr_linenumber" name="258" href="#258">258</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="259" href="#259">259</a> }
-<a class="jxr_linenumber" name="260" href="#260">260</a> Thread.sleep(50);
-<a class="jxr_linenumber" name="261" href="#261">261</a> }
-<a class="jxr_linenumber" name="262" href="#262">262</a> assertTrue(newcount > count);
-<a class="jxr_linenumber" name="263" href="#263">263</a> List<RegionServerThread> regionServerThreads = TEST_UTIL.getHBaseCluster()
-<a class="jxr_linenumber" name="264" href="#264">264</a> .getRegionServerThreads();
-<a class="jxr_linenumber" name="265" href="#265">265</a> <strong class="jxr_keyword">for</strong> (RegionServerThread rs : regionServerThreads) {
-<a class="jxr_linenumber" name="266" href="#266">266</a> CompactedHFilesDischarger cleaner = <strong class="jxr_keyword">new</strong> CompactedHFilesDischarger(100, <strong class="jxr_keyword">null</strong>,
-<a class="jxr_linenumber" name="267" href="#267">267</a> rs.getRegionServer(), false);
-<a class="jxr_linenumber" name="268" href="#268">268</a> cleaner.chore();
-<a class="jxr_linenumber" name="269" href="#269">269</a> Thread.sleep(1000);
-<a class="jxr_linenumber" name="270" href="#270">270</a> }
-<a class="jxr_linenumber" name="271" href="#271">271</a> <strong class="jxr_keyword">while</strong> (System.currentTimeMillis() < timeout) {
-<a class="jxr_linenumber" name="272" href="#272">272</a> <strong class="jxr_keyword">int</strong> newcount1 = 0;
-<a class="jxr_linenumber" name="273" href="#273">273</a> <strong class="jxr_keyword">for</strong>(HColumnDescriptor colFamily : columnFamilies) {
-<a class="jxr_linenumber" name="274" href="#274">274</a> newcount1 += hrfs.getStoreFiles(colFamily.getName()).size();
-<a class="jxr_linenumber" name="275" href="#275">275</a> }
-<a class="jxr_linenumber" name="276" href="#276">276</a> <strong class="jxr_keyword">if</strong>(newcount1 <= 1) {
-<a class="jxr_linenumber" name="277" href="#277">277</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="278" href="#278">278</a> }
-<a class="jxr_linenumber" name="279" href="#279">279</a> Thread.sleep(50);
-<a class="jxr_linenumber" name="280" href="#280">280</a> }
-<a class="jxr_linenumber" name="281" href="#281">281</a> <em class="jxr_comment">// run CatalogJanitor to clean merge references in hbase:meta and archive the</em>
-<a class="jxr_linenumber" name="282" href="#282">282</a> <em class="jxr_comment">// files of merging regions</em>
-<a class="jxr_linenumber" name="283" href="#283">283</a> <strong class="jxr_keyword">int</strong> cleaned = 0;
-<a class="jxr_linenumber" name="284" href="#284">284</a> <strong class="jxr_keyword">while</strong> (cleaned == 0) {
-<a class="jxr_linenumber" name="285" href="#285">285</a> cleaned = admin.runCatalogScan();
-<a class="jxr_linenumber" name="286" href="#286">286</a> LOG.debug(<span class="jxr_string">"catalog janitor returned "</span> + cleaned);
-<a class="jxr_linenumber" name="287" href="#287">287</a> Thread.sleep(50);
-<a class="jxr_linenumber" name="288" href="#288">288</a> }
-<a class="jxr_linenumber" name="289" href="#289">289</a> assertFalse(regionAdir.toString(), fs.exists(regionAdir));
-<a class="jxr_linenumber" name="290" href="#290">290</a> assertFalse(regionBdir.toString(), fs.exists(regionBdir));
-<a class="jxr_linenumber" name="291" href="#291">291</a> assertTrue(cleaned > 0);
-<a class="jxr_linenumber" name="292" href="#292">292</a>
-<a class="jxr_linenumber" name="293" href="#293">293</a> mergedRegionResult = MetaTableAccessor.getRegionResult(
-<a class="jxr_linenumber" name="294" href="#294">294</a> master.getConnection(), mergedRegionInfo.getRegionName());
-<a class="jxr_linenumber" name="295" href="#295">295</a> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,
-<a class="jxr_linenumber" name="296" href="#296">296</a> HConstants.MERGEA_QUALIFIER) != <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="297" href="#297">297</a> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,
-<a class="jxr_linenumber" name="298" href="#298">298</a> HConstants.MERGEB_QUALIFIER) != <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="299" href="#299">299</a>
-<a class="jxr_linenumber" name="300" href="#300">300</a> } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="301" href="#301">301</a> admin.enableCatalogJanitor(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="302" href="#302">302</a> }
-<a class="jxr_linenumber" name="303" href="#303">303</a> }
-<a class="jxr_linenumber" name="304" href="#304">304</a>
-<a class="jxr_linenumber" name="305" href="#305">305</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="306" href="#306">306</a> <em class="jxr_javadoccomment"> * This test tests 1, merging region not online;</em>
-<a class="jxr_linenumber" name="307" href="#307">307</a> <em class="jxr_javadoccomment"> * 2, merging same two regions; 3, merging unknown regions.</em>
-<a class="jxr_linenumber" name="308" href="#308">308</a> <em class="jxr_javadoccomment"> * They are in one test case so that we don't have to create</em>
-<a class="jxr_linenumber" name="309" href="#309">309</a> <em class="jxr_javadoccomment"> * many tables, and these tests are simple.</em>
-<a class="jxr_linenumber" name="310" href="#310">310</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="311" href="#311">311</a> @Test
-<a class="jxr_linenumber" name="312" href="#312">312</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMerge() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="313" href="#313">313</a> LOG.info(<span class="jxr_string">"Starting testMerge"</span>);
-<a class="jxr_linenumber" name="314" href="#314">314</a> <strong class="jxr_keyword">final</strong> TableName tableName = TableName.valueOf(<span class="jxr_string">"testMerge"</span>);
-<a class="jxr_linenumber" name="315" href="#315">315</a>
-<a class="jxr_linenumber" name="316" href="#316">316</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="317" href="#317">317</a> <em class="jxr_comment">// Create table and load data.</em>
-<a class="jxr_linenumber" name="318" href="#318">318</a> Table table = createTableAndLoadData(master, tableName);
-<a class="jxr_linenumber" name="319" href="#319">319</a> RegionStates regionStates = master.getAssignmentManager().getRegionStates();
-<a class="jxr_linenumber" name="320" href="#320">320</a> List<HRegionInfo> regions = regionStates.getRegionsOfTable(tableName);
-<a class="jxr_linenumber" name="321" href="#321">321</a> <em class="jxr_comment">// Fake offline one region</em>
-<a class="jxr_linenumber" name="322" href="#322">322</a> HRegionInfo a = regions.get(0);
-<a class="jxr_linenumber" name="323" href="#323">323</a> HRegionInfo b = regions.get(1);
-<a class="jxr_linenumber" name="324" href="#324">324</a> regionStates.regionOffline(a);
-<a class="jxr_linenumber" name="325" href="#325">325</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="326" href="#326">326</a> <em class="jxr_comment">// Merge offline region. Region a is offline here</em>
-<a class="jxr_linenumber" name="327" href="#327">327</a> admin.mergeRegions(a.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), false);
-<a class="jxr_linenumber" name="328" href="#328">328</a> fail(<span class="jxr_string">"Offline regions should not be able to merge"</span>);
-<a class="jxr_linenumber" name="329" href="#329">329</a> } <strong class="jxr_keyword">catch</strong> (IOException ie) {
-<a class="jxr_linenumber" name="330" href="#330">330</a> System.out.println(ie);
-<a class="jxr_linenumber" name="331" href="#331">331</a> assertTrue(<span class="jxr_string">"Exception should mention regions not online"</span>,
-<a class="jxr_linenumber" name="332" href="#332">332</a> StringUtils.stringifyException(ie).contains(<span class="jxr_string">"regions not online"</span>)
-<a class="jxr_linenumber" name="333" href="#333">333</a> && ie instanceof MergeRegionException);
-<a class="jxr_linenumber" name="334" href="#334">334</a> }
-<a class="jxr_linenumber" name="335" href="#335">335</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="336" href="#336">336</a> <em class="jxr_comment">// Merge the same region: b and b.</em>
-<a class="jxr_linenumber" name="337" href="#337">337</a> admin.mergeRegions(b.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="338" href="#338">338</a> fail(<span class="jxr_string">"A region should not be able to merge with itself, even forcifully"</span>);
-<a class="jxr_linenumber" name="339" href="#339">339</a> } <strong class="jxr_keyword">catch</strong> (IOException ie) {
-<a class="jxr_linenumber" name="340" href="#340">340</a> assertTrue(<span class="jxr_string">"Exception should mention regions not online"</span>,
-<a class="jxr_linenumber" name="341" href="#341">341</a> StringUtils.stringifyException(ie).contains(<span class="jxr_string">"region to itself"</span>)
-<a class="jxr_linenumber" name="342" href="#342">342</a> && ie instanceof MergeRegionException);
-<a class="jxr_linenumber" name="343" href="#343">343</a> }
-<a class="jxr_linenumber" name="344" href="#344">344</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="345" href="#345">345</a> <em class="jxr_comment">// Merge unknown regions</em>
-<a class="jxr_linenumber" name="346" href="#346">346</a> admin.mergeRegions(Bytes.toBytes(<span class="jxr_string">"-f1"</span>), Bytes.toBytes(<span class="jxr_string">"-f2"</span>), <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="347" href="#347">347</a> fail(<span class="jxr_string">"Unknown region could not be merged"</span>);
-<a class="jxr_linenumber" name="348" href="#348">348</a> } <strong class="jxr_keyword">catch</strong> (IOException ie) {
-<a class="jxr_linenumber" name="349" href="#349">349</a> assertTrue(<span class="jxr_string">"UnknownRegionException should be thrown"</span>,
-<a class="jxr_linenumber" name="350" href="#350">350</a> ie instanceof UnknownRegionException);
-<a class="jxr_linenumber" name="351" href="#351">351</a> }
-<a class="jxr_linenumber" name="352" href="#352">352</a> table.close();
-<a class="jxr_linenumber" name="353" href="#353">353</a> } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="354" href="#354">354</a> TEST_UTIL.deleteTable(tableName);
-<a class="jxr_linenumber" name="355" href="#355">355</a> }
-<a class="jxr_linenumber" name="356" href="#356">356</a> }
-<a class="jxr_linenumber" name="357" href="#357">357</a>
-<a class="jxr_linenumber" name="358" href="#358">358</a> @Test
-<a class="jxr_linenumber" name="359" href="#359">359</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMergeWithReplicas() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="360" href="#360">360</a> <strong class="jxr_keyword">final</strong> TableName tableName = TableName.valueOf(<span class="jxr_string">"testMergeWithReplicas"</span>);
-<a class="jxr_linenumber" name="361" href="#361">361</a> <em class="jxr_comment">// Create table and load data.</em>
-<a class="jxr_linenumber" name="362" href="#362">362</a> createTableAndLoadData(master, tableName, 5, 2);
-<a class="jxr_linenumber" name="363" href="#363">363</a> List<Pair<HRegionInfo, ServerName>> initialRegionToServers =
-<a class="jxr_linenumber" name="364" href="#364">364</a> MetaTableAccessor.getTableRegionsAndLocations(
-<a class="jxr_linenumber" name="365" href="#365">365</a> master.getConnection(), tableName);
-<a class="jxr_linenumber" name="366" href="#366">366</a> <em class="jxr_comment">// Merge 1st and 2nd region</em>
-<a class="jxr_linenumber" name="367" href="#367">367</a> PairOfSameType<HRegionInfo> mergedRegions = mergeRegionsAndVerifyRegionNum(master, tableName,
-<a class="jxr_linenumber" name="368" href="#368">368</a> 0, 2, 5 * 2 - 2);
-<a class="jxr_linenumber" name="369" href="#369">369</a> List<Pair<HRegionInfo, ServerName>> currentRegionToServers =
-<a class="jxr_linenumber" name="370" href="#370">370</a> MetaTableAccessor.getTableRegionsAndLocations(
-<a class="jxr_linenumber" name="371" href="#371">371</a> master.getConnection(), tableName);
-<a class="jxr_linenumber" name="372" href="#372">372</a> List<HRegionInfo> initialRegions = <strong class="jxr_keyword">new</strong> ArrayList<HRegionInfo>();
-<a class="jxr_linenumber" name="373" href="#373">373</a> <strong class="jxr_keyword">for</strong> (Pair<HRegionInfo, ServerName> p : initialRegionToServers) {
-<a class="jxr_linenumber" name="374" href="#374">374</a> initialRegions.add(p.getFirst());
-<a class="jxr_linenumber" name="375" href="#375">375</a> }
-<a class="jxr_linenumber" name="376" href="#376">376</a> List<HRegionInfo> currentRegions = <strong class="jxr_keyword">new</strong> ArrayList<HRegionInfo>();
-<a class="jxr_linenumber" name="377" href="#377">377</a> <strong class="jxr_keyword">for</strong> (Pair<HRegionInfo, ServerName> p : currentRegionToServers) {
-<a class="jxr_linenumber" name="378" href="#378">378</a> currentRegions.add(p.getFirst());
+<a class="jxr_linenumber" name="188" href="#188">188</a> <em class="jxr_comment">// Create table and load data.</em>
+<a class="jxr_linenumber" name="189" href="#189">189</a> Table table = createTableAndLoadData(MASTER, tableName);
+<a class="jxr_linenumber" name="190" href="#190">190</a>
+<a class="jxr_linenumber" name="191" href="#191">191</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="192" href="#192">192</a> MyMasterRpcServices.enabled.set(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="193" href="#193">193</a>
+<a class="jxr_linenumber" name="194" href="#194">194</a> <em class="jxr_comment">// Merge 1st and 2nd region</em>
+<a class="jxr_linenumber" name="195" href="#195">195</a> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1, INITIAL_REGION_NUM - 1);
+<a class="jxr_linenumber" name="196" href="#196">196</a> } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="197" href="#197">197</a> MyMasterRpcServices.enabled.set(false);
+<a class="jxr_linenumber" name="198" href="#198">198</a> }
+<a class="jxr_linenumber" name="199" href="#199">199</a>
+<a class="jxr_linenumber" name="200" href="#200">200</a> table.close();
+<a class="jxr_linenumber" name="201" href="#201">201</a> }
+<a class="jxr_linenumber" name="202" href="#202">202</a>
+<a class="jxr_linenumber" name="203" href="#203">203</a> @Test
+<a class="jxr_linenumber" name="204" href="#204">204</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testCleanMergeReference() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="205" href="#205">205</a> LOG.info(<span class="jxr_string">"Starting testCleanMergeReference"</span>);
+<a class="jxr_linenumber" name="206" href="#206">206</a> ADMIN.enableCatalogJanitor(false);
+<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="208" href="#208">208</a> <strong class="jxr_keyword">final</strong> TableName tableName =
+<a class="jxr_linenumber" name="209" href="#209">209</a> TableName.valueOf(<span class="jxr_string">"testCleanMergeReference"</span>);
+<a class="jxr_linenumber" name="210" href="#210">210</a> <em class="jxr_comment">// Create table and load data.</em>
+<a class="jxr_linenumber" name="211" href="#211">211</a> Table table = createTableAndLoadData(MASTER, tableName);
+<a class="jxr_linenumber" name="212" href="#212">212</a> <em class="jxr_comment">// Merge 1st and 2nd region</em>
+<a class="jxr_linenumber" name="213" href="#213">213</a> mergeRegionsAndVerifyRegionNum(MASTER, tableName, 0, 1,
+<a class="jxr_linenumber" name="214" href="#214">214</a> INITIAL_REGION_NUM - 1);
+<a class="jxr_linenumber" name="215" href="#215">215</a> verifyRowCount(table, ROWSIZE);
+<a class="jxr_linenumber" name="216" href="#216">216</a> table.close();
+<a class="jxr_linenumber" name="217" href="#217">217</a>
+<a class="jxr_linenumber" name="218" href="#218">218</a> List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor
+<a class="jxr_linenumber" name="219" href="#219">219</a> .getTableRegionsAndLocations(MASTER.getConnection(), tableName);
+<a class="jxr_linenumber" name="220" href="#220">220</a> HRegionInfo mergedRegionInfo = tableRegions.get(0).getFirst();
+<a class="jxr_linenumber" name="221" href="#221">221</a> HTableDescriptor tableDescriptor = MASTER.getTableDescriptors().get(
+<a class="jxr_linenumber" name="222" href="#222">222</a> tableName);
+<a class="jxr_linenumber" name="223" href="#223">223</a> Result mergedRegionResult = MetaTableAccessor.getRegionResult(
+<a class="jxr_linenumber" name="224" href="#224">224</a> MASTER.getConnection(), mergedRegionInfo.getRegionName());
+<a class="jxr_linenumber" name="225" href="#225">225</a>
+<a class="jxr_linenumber" name="226" href="#226">226</a> <em class="jxr_comment">// contains merge reference in META</em>
+<a class="jxr_linenumber" name="227" href="#227">227</a> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,
+<a class="jxr_linenumber" name="228" href="#228">228</a> HConstants.MERGEA_QUALIFIER) != <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="229" href="#229">229</a> assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,
+<a class="jxr_linenumber" name="230" href="#230">230</a> HConstants.MERGEB_QUALIFIER) != <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="231" href="#231">231</a>
+<a class="jxr_linenumber" name="232" href="#232">232</a> <em class="jxr_comment">// merging regions' directory are in the file system all the same</em>
+<a class="jxr_linenumber" name="233" href="#233">233</a> PairOfSameType<HRegionInfo> p = MetaTableAccessor.getMergeRegions(mergedRegionResult);
+<a class="jxr_linenumber" name="234" href="#234">234</a> HRegionInfo regionA = p.getFirst();
+<a class="jxr_linenumber" name="235" href="#235">235</a> HRegionInfo regionB = p.getSecond();
+<a class="jxr_linenumber" name="236" href="#236">236</a> FileSystem fs = MASTER.getMasterFileSystem().getFileSystem();
+<a class="jxr_linenumber" name="237" href="#237">237</a> Path rootDir = MASTER.getMasterFileSystem().getRootDir();
+<a class="jxr_linenumber" name="238" href="#238">238</a>
+<a class="jxr_linenumber" name="239" href="#239">239</a> Path tabledir = FSUtils.getTableDir(rootDir, mergedRegionInfo.getTable());
+<a class="jxr_linenumber" name="240" href="#240">240</a> Path regionAdir = <strong class="jxr_keyword">new</strong> Path(tabledir, regionA.getEncodedName());
+<a class="jxr_linenumber" name="241" href="#241">241</a> Path regionBdir = <strong class="jxr_keyword">new</strong> Path(tabledir, regionB.getEncodedName());
+<a class="jxr_linenumber" name="242" href="#242">242</a> assertTrue(fs.exists(regionAdir));
+<a class="jxr_linenumber" name="243" href="#243">243</a> assertTrue(fs.exists(regionBdir));
+<a class="jxr_linenumber" name="244" href="#244">244</a>
+<a class="jxr_linenumber" name="245" href="#245">245</a> HColumnDescriptor[] columnFamilies = tableDescriptor.getColumnFamilies();
+<a class="jxr_linenumber" name="246" href="#246">246</a> HRegionFileSystem hrfs = <strong class="jxr_keyword">new</strong> HRegionFileSystem(
+<a class="jxr_linenumber" name="247" href="#247">247</a> TEST_UTIL.getConfiguration(), fs, tabledir, mergedRegionInfo);
+<a class="jxr_linenumber" name="248" href="#248">248</a> <strong class="jxr_keyword">int</strong> count = 0;
+<a class="jxr_linenumber" name="249" href="#249">249</a> <strong class="jxr_keyword">for</strong>(HColumnDescriptor colFamily : columnFamilies) {
+<a class="jxr_linenumber" name="250" href="#250">250</a> count += hrfs.getStoreFiles(colFamily.getName()).size();
+<a class="jxr_linenumber" name="251" href="#251">251</a> }
+<a class="jxr_linenumber" name="252" href="#252">252</a> ADMIN.compactRegion(mergedRegionInfo.getRegionName());
+<a class="jxr_linenumber" name="253" href="#253">253</a> <em class="jxr_comment">// clean up the merged region store files</em>
+<a class="jxr_linenumber" name="254" href="#254">254</a> <em class="jxr_comment">// wait until merged region have reference file</em>
+<a class="jxr_linenumber" name="255" href="#255">255</a> <strong class="jxr_keyword">long</strong> timeout = System.currentTimeMillis() + waitTime;
+<a class="jxr_linenumber" name="256" href="#256">256</a> <strong class="jxr_keyword">int</strong> newcount = 0;
+<a class="jxr_linenumber" name="257" href="#257">257</a> <strong class="jxr_keyword">while</strong> (System.currentTimeMillis() < timeout) {
+<a class="jxr_linenumber" name="258" href="#258">258</a> <strong class="jxr_keyword">for</strong>(HColumnDescriptor colFamily : columnFamilies) {
+<a class="jxr_linenumber" name="259" href="#259">259</a> newcount += hrfs.getStoreFiles(colFamily.getName()).size();
+<a class="jxr_linenumber" name="260" href="#260">260</a> }
+<a class="jxr_linenumber" name="261" href="#261">261</a> <strong class="jxr_keyword">if</strong>(newcount > count) {
+<a class="jxr_linenumber" name="262" href="#262">262</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="263" href="#263">263</a> }
+<a class="jxr_linenumber" name="264" href="#264">264</a> Thread.sleep(50);
+<a class="jxr_linenumber" name="265" href="#265">265</a> }
+<a class="jxr_linenumber" name="266" href="#266">266</a> assertTrue(newcount > count);
+<a class="jxr_linenumber" name="267" href="#267">267</a> List<RegionServerThread> regionServerThreads = TEST_UTIL.getHBaseCluster()
+<a class="jxr_linenumber" name="268" href="#268">268</a> .getRegionServerThreads();
+<a class="jxr_linenumber" name="269" href="#269">269</a> <strong class="jxr_keyword">for</strong> (RegionServerThread rs : regionServerThreads) {
+<a class="jxr_linenumber" name="270" href="#270">270</a> CompactedHFilesDischarger cleaner = <strong class="jxr_keyword">new</strong> CompactedHFilesDischarger(100, <strong class="jxr_keyword">null</strong>,
+<a class="jxr_linenumber" name="271" href="#271">271</a> rs.getRegionServer(), false);
+<a class="jxr_linenumber" name="272" href="#272">272</a> cleaner.chore();
+<a class="jxr_linenumber" name="273" href="#273">273</a> Thread.sleep(1000);
+<a class="jxr_linenumber" name="274" href="#274">274</a> }
+<a class="jxr_linenumber" name="275" href="#275">275</a> <strong class="jxr_keyword">while</strong> (System.currentTimeMillis() < timeout) {
+<a class="jxr_linenumber" name="276" href="#276">276</a> <strong class="jxr_keyword">int</strong> newcount1 = 0;
+<a class="jxr_linenumber" name="277" href="#277">277</a> <strong class="jxr_keyword">for</strong>(HColumnDescriptor colFamily : columnFamilies) {
+<a class="jxr_linenumber" name="278" href="#278">278</a> newcount1 += hrfs.getStoreFiles(colFamily.getName()).size();
+<a class="jxr_linenumber" name="279" href="#279">279</a> }
+<a class="jxr_linenumber" name="280" href="#280">280</a> <strong class="jxr_keyword">if</strong>(newcount1 <= 1) {
+<a class="jxr_linenumber" name="281" href="#281">281</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="282" href="#282">282</a> }
+<a class="jxr_linenumber" name="283" href="#283">283</a> Thread.sleep(50);
+<a class="jxr_linenumber" name="284" href="#284">284</a> }
+<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_comment">// run CatalogJanitor to clean merge references in hbase:meta and archive the</em>
+<a class="jxr_linenumber" name="286" href="#286">286</a> <em class="jxr_comment">// files of merging regions</em>
+<a class="jxr_linenumber" name="287" href="#287">287</a> <strong class="jxr_keyword">int</strong> cleaned = 0;
+<a class="jxr_linenumber" name="288" href="#288">288</a> <strong class="jxr_keyword">while</strong> (cleaned == 0) {
+<a class="jxr_linenumber" name="289" href="#289">289</a> cleaned = ADMIN.runCatalogScan();
+<a class="jxr_linenumber" name="290" href="#290">290</a> LOG.debug(<span class="jxr_string">"catalog janitor returned "</span> + cleaned);
+<a class="jxr_linenumber" name="291" href="#291">291</a> Thread.sleep(50);
+<a class="jxr_linenumber" name="292" href="#292">292</a> }
+<a class="jxr_linenumber" name="293" href="#293">293</a> assertFalse(regionAdir.toString(), fs.exists(regionAdir));
+<a class="jxr_linenumber" name="294" href="#294">294</a> assertFalse(regionBdir.toString(), fs.exists(regionBdir));
+<a class="jxr_linenumber" name="295" href="#295">295</a> assertTrue(cleaned > 0);
+<a class="jxr_linenumber" name="296" href="#296">296</a>
+<a class="jxr_linenumber" name="297" href="#297">297</a> mergedRegionResult = MetaTableAccessor.getRegionResult(
+<a class="jxr_linenumber" name="298" href="#298">298</a> TEST_UTIL.getConnection(), mergedRegionInfo.getRegionName());
+<a class="jxr_linenumber" name="299" href="#299">299</a> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,
+<a class="jxr_linenumber" name="300" href="#300">300</a> HConstants.MERGEA_QUALIFIER) != <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="301" href="#301">301</a> assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY,
+<a class="jxr_linenumber" name="302" href="#302">302</a> HConstants.MERGEB_QUALIFIER) != <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="303" href="#303">303</a>
+<a class="jxr_linenumber" name="304" href="#304">304</a> } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="305" href="#305">305</a> ADMIN.enableCatalogJanitor(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="306" href="#306">306</a> }
+<a class="jxr_linenumber" name="307" href="#307">307</a> }
+<a class="jxr_linenumber" name="308" href="#308">308</a>
+<a class="jxr_linenumber" name="309" href="#309">309</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="310" href="#310">310</a> <em class="jxr_javadoccomment"> * This test tests 1, merging region not online;</em>
+<a class="jxr_linenumber" name="311" href="#311">311</a> <em class="jxr_javadoccomment"> * 2, merging same two regions; 3, merging unknown regions.</em>
+<a class="jxr_linenumber" name="312" href="#312">312</a> <em class="jxr_javadoccomment"> * They are in one test case so that we don't have to create</em>
+<a class="jxr_linenumber" name="313" href="#313">313</a> <em class="jxr_javadoccomment"> * many tables, and these tests are simple.</em>
+<a class="jxr_linenumber" name="314" href="#314">314</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="315" href="#315">315</a> @Test
+<a class="jxr_linenumber" name="316" href="#316">316</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMerge() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="317" href="#317">317</a> LOG.info(<span class="jxr_string">"Starting testMerge"</span>);
+<a class="jxr_linenumber" name="318" href="#318">318</a> <strong class="jxr_keyword">final</strong> TableName tableName = TableName.valueOf(<span class="jxr_string">"testMerge"</span>);
+<a class="jxr_linenumber" name="319" href="#319">319</a>
+<a class="jxr_linenumber" name="320" href="#320">320</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="321" href="#321">321</a> <em class="jxr_comment">// Create table and load data.</em>
+<a class="jxr_linenumber" name="322" href="#322">322</a> Table table = createTableAndLoadData(MASTER, tableName);
+<a class="jxr_linenumber" name="323" href="#323">323</a> RegionStates regionStates = MASTER.getAssignmentManager().getRegionStates();
+<a class="jxr_linenumber" name="324" href="#324">324</a> List<HRegionInfo> regions = regionStates.getRegionsOfTable(tableName);
+<a class="jxr_linenumber" name="325" href="#325">325</a> <em class="jxr_comment">// Fake offline one region</em>
+<a class="jxr_linenumber" name="326" href="#326">326</a> HRegionInfo a = regions.get(0);
+<a class="jxr_linenumber" name="327" href="#327">327</a> HRegionInfo b = regions.get(1);
+<a class="jxr_linenumber" name="328" href="#328">328</a> regionStates.regionOffline(a);
+<a class="jxr_linenumber" name="329" href="#329">329</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="330" href="#330">330</a> <em class="jxr_comment">// Merge offline region. Region a is offline here</em>
+<a class="jxr_linenumber" name="331" href="#331">331</a> ADMIN.mergeRegions(a.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), false);
+<a class="jxr_linenumber" name="332" href="#332">332</a> fail(<span class="jxr_string">"Offline regions should not be able to merge"</span>);
+<a class="jxr_linenumber" name="333" href="#333">333</a> } <strong class="jxr_keyword">catch</strong> (IOException ie) {
+<a class="jxr_linenumber" name="334" href="#334">334</a> System.out.println(ie);
+<a class="jxr_linenumber" name="335" href="#335">335</a> assertTrue(<span class="jxr_string">"Exception should mention regions not online"</span>,
+<a class="jxr_linenumber" name="336" href="#336">336</a> StringUtils.stringifyException(ie).contains(<span class="jxr_string">"regions not online"</span>)
+<a class="jxr_linenumber" name="337" href="#337">337</a> && ie instanceof MergeRegionException);
+<a class="jxr_linenumber" name="338" href="#338">338</a> }
+<a class="jxr_linenumber" name="339" href="#339">339</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="340" href="#340">340</a> <em class="jxr_comment">// Merge the same region: b and b.</em>
+<a class="jxr_linenumber" name="341" href="#341">341</a> ADMIN.mergeRegions(b.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="342" href="#342">342</a> fail(<span class="jxr_string">"A region should not be able to merge with itself, even forcifully"</span>);
+<a class="jxr_linenumber" name="343" href="#343">343</a> } <strong class="jxr_keyword">catch</strong> (IOException ie) {
+<a class="jxr_linenumber" name="344" href="#344">344</a> assertTrue(<span class="jxr_string">"Exception should mention regions not online"</span>,
+<a class="jxr_linenumber" name="345" href="#345">345</a> StringUtils.stringifyException(ie).contains(<span class="jxr_string">"region to itself"</span>)
+<a class="jxr_linenumber" name="346" href="#346">346</a> && ie instanceof MergeRegionException);
+<a class="jxr_linenumber" name="347" href="#347">347</a> }
+<a class="jxr_linenumber" name="348" href="#348">348</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="349" href="#349">349</a> <em class="jxr_comment">// Merge unknown regions</em>
+<a class="jxr_linenumber" name="350" href="#350">350</a> ADMIN.mergeRegions(Bytes.toBytes(<span class="jxr_string">"-f1"</span>), Bytes.toBytes(<span class="jxr_string">"-f2"</span>), <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="351" href="#351">351</a> fail(<span class="jxr_string">"Unknown region could not be merged"</span>);
+<a class="jxr_linenumber" name="352" href="#352">352</a> } <strong class="jxr_keyword">catch</strong> (IOException ie) {
+<a class="jxr_linenumber" name="353" href="#353">353</a> assertTrue(<span class="jxr_string">"UnknownRegionException should be thrown"</span>,
+<a class="jxr_linenumber" name="354" href="#354">354</a> ie instanceof UnknownRegionException);
+<a class="jxr_linenumber" name="355" href="#355">355</a> }
+<a class="jxr_linenumber" name="356" href="#356">356</a> table.close();
+<a class="jxr_linenumber" name="357" href="#357">357</a> } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="358" href="#358">358</a> TEST_UTIL.deleteTable(tableName);
+<a class="jxr_linenumber" name="359" href="#359">359</a> }
+<a class="jxr_linenumber" name="360" href="#360">360</a> }
+<a class="jxr_linenumber" name="361" href="#361">361</a>
+<a class="jxr_linenumber" name="362" href="#362">362</a> @Test
+<a class="jxr_linenumber" name="363" href="#363">363</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMergeWithReplicas() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="364" href="#364">364</a> <strong class="jxr_keyword">final</strong> TableName tableName = TableName.valueOf(<span class="jxr_string">"testMergeWithReplicas"</span>);
+<a class="jxr_linenumber" name="365" href="#365">365</a> <em class="jxr_comment">// Create table and load data.</em>
+<a class="jxr_linenumber" name="366" href="#366">366</a> createTableAndLoadData(MASTER, tableName, 5, 2);
+<a class="jxr_linenumber" name="367" href="#367">367</a> List<Pair<HRegionInfo, ServerName>> initialRegionToServers =
+<a class="jxr_linenumber" name="368" href="#368">368</a> MetaTableAccessor.getTableRegionsAndLocations(
+<a class="jxr_linenumber" name="369" href="#369">369</a> TEST_UTIL.getConnection(), tableName);
+<a class="jxr_linenumber" name="370" href="#370">370</a> <em class="jxr_comment">// Merge 1st and 2nd region</em>
+<a class="jxr_linenumber" name="371" href="#371">371</a> PairOfSameType<HRegionInfo> mergedRegions = mergeRegionsAndVerifyRegionNum(MASTER, tableName,
+<a class="jxr_linenumber" name="372" href="#372">372</a> 0, 2, 5 * 2 - 2);
+<a class="jxr_linenumber" name="373" href="#373">373</a> List<Pair<HRegionInfo, ServerName>> currentRegionToServers =
+<a class="jxr_linenumber" name="374" href="#374">374</a> MetaTableAccessor.getTableRegionsAndLocations(
+<a class="jxr_linenumber" name="375" href="#375">375</a> TEST_UTIL.getConnection(), tableName);
+<a class="jxr_linenumber" name="376" href="#376">376</a> List<HRegionInfo> initialRegions = <strong class="jxr_keyword">new</strong> ArrayList<HRegionInfo>();
+<a class="jxr_linenumber" name="377" href="#377">377</a> <strong class="jxr_keyword">for</strong> (Pair<HRegionInfo, ServerName> p : initialRegionToServers) {
+<a class="jxr_linenumber" name="378" href="#378">378</a> initialRegions.add(p.getFirst());
<a class="jxr_linenumber" name="379" href="#379">379</a> }
-<a class="jxr_linenumber" name="380" href="#380">380</a> assertTrue(initialRegions.contains(mergedRegions.getFirst())); <em class="jxr_comment">//this is the first region</em>
-<a class="jxr_linenumber" name="381" href="#381">381</a> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(
-<a class="jxr_linenumber" name="382" href="#382">382</a> mergedRegions.getFirst(), 1))); <em class="jxr_comment">//this is the replica of the first region</em>
-<a class="jxr_linenumber" name="383" href="#383">383</a> assertTrue(initialRegions.contains(mergedRegions.getSecond())); <em class="jxr_comment">//this is the second region</em>
-<a class="jxr_linenumber" name="384" href="#384">384</a> assertTrue(initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(
-<a class="jxr_linenumber" name="385" href="#385">385</a> mergedRegions.getSecond(), 1))); <em class="jxr_comment">//this is the replica of the second region</em>
-<a class="jxr_linenumber" name="386" href="#386">386</a> assertTrue(!initialRegions.contains(currentRegions.get(0))); <em class="jxr_comment">//this is the new region</em>
-<a class="jxr_linenumber" name="387" href="#387">387</a> assertTrue(!initialRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(
-<a class="jxr_linenumber" name="388" href="#388">388</a> currentRegions.get(0), 1))); <em class="jxr_comment">//replica of the new region</em>
-<a class="jxr_linenumber" name="389" href="#389">389</a> assertTrue(currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(
-<a class="jxr_linenumber" name="390" href="#390">390</a> currentRegions.get(0), 1))); <em class="jxr_comment">//replica of the new region</em>
-<a class="jxr_linenumber" name="391" href="#391">391</a> assertTrue(!currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(
-<a class="jxr_linenumber" name="392" href="#392">392</a> mergedRegions.getFirst(), 1))); <em class="jxr_comment">//replica of the merged region</em>
-<a class="jxr_linenumber" name="393" href="#393">393</a> assertTrue(!currentRegions.contains(RegionReplicaUtil.getRegionInfoForReplica(
-<a class="jxr_linenumber" name="394" href="#394">394</a> mergedRegions.getSecond(), 1))); <em class="jxr_comment">//replica of the merged region</em>
-<a class="jxr_linenumber" name="395" href="#395">395</a> }
-<a class="jxr_linenumber" name="396" href="#396">396</a>
-<a class="jxr_linenumber" name="397" href="#397">397</a> <strong class="jxr_keyword">private</strong> PairOfSameType<HRegionInfo> mergeRegionsAndVerifyRegionNum(
-<a class="jxr_linenumber" name="398" href="#398">398</a> HMaster master, TableName tablename,
-<a class="jxr_linenumber" name="399" href="#399">399</a> <strong class="jxr_keyword">int</strong> regionAnum, <strong class="jxr_keyword">int</strong> regionBnum, <strong class="jxr_keyword">int</strong> expectedRegionNum) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="400" href="#400">400</a> PairOfSameType<HRegionInfo> mergedRegions =
-<a class="jxr_linenumber" name="401" href="#401">401</a> requestMergeRegion(master, tablename, regionAnum, regionBnum);
-<a class="jxr_linenumber" name="402" href="#402">402</a> waitAndVerifyRegionNum(master, tablename, expectedRegionNum);
-<a class="jxr_linenumber" name="403" href="#403">403</a> <strong class="jxr_keyword">return</strong> mergedRegions;
-<a class="jxr_linenumber" name="404" href="#404">404</a> }
-
<TRUNCATED>
[07/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/xref-test/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html b/xref-test/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
index 7197d9f..617bd79 100644
--- a/xref-test/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
+++ b/xref-test/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
@@ -40,135 +40,140 @@
<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.testclassification.MiscTests;
<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.testclassification.SmallTests;
<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.junit.Assert;
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.junit.experimental.categories.Category;
-<a class="jxr_linenumber" name="35" href="#35">35</a>
-<a class="jxr_linenumber" name="36" href="#36">36</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="37" href="#37">37</a> <em class="jxr_javadoccomment"> * This tests whether ServerSocketChannel works over ipv6, which Zookeeper</em>
-<a class="jxr_linenumber" name="38" href="#38">38</a> <em class="jxr_javadoccomment"> * depends on. On Windows Oracle JDK 6, creating a ServerSocketChannel throws</em>
-<a class="jxr_linenumber" name="39" href="#39">39</a> <em class="jxr_javadoccomment"> * java.net.SocketException: Address family not supported by protocol family</em>
-<a class="jxr_linenumber" name="40" href="#40">40</a> <em class="jxr_javadoccomment"> * exception. It is a known JVM bug, seems to be only resolved for JDK7:</em>
-<a class="jxr_linenumber" name="41" href="#41">41</a> <em class="jxr_javadoccomment"> * <a href="http://bugs.sun.com/view_bug.do?bug_id=6230761" target="alexandria_uri">http://bugs.sun.com/view_bug.do?bug_id=6230761</a></em>
-<a class="jxr_linenumber" name="42" href="#42">42</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="43" href="#43">43</a> <em class="jxr_javadoccomment"> * For this test, we check that whether we are effected by this bug, and if so</em>
-<a class="jxr_linenumber" name="44" href="#44">44</a> <em class="jxr_javadoccomment"> * the test ensures that we are running with java.net.preferIPv4Stack=true, so</em>
-<a class="jxr_linenumber" name="45" href="#45">45</a> <em class="jxr_javadoccomment"> * that ZK will not fail to bind to ipv6 address using ClientCnxnSocketNIO.</em>
-<a class="jxr_linenumber" name="46" href="#46">46</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="47" href="#47">47</a> @Category({MiscTests.<strong class="jxr_keyword">class</strong>, SmallTests.<strong class="jxr_keyword">class</strong>})
-<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html">TestIPv6NIOServerSocketChannel</a> {
-<a class="jxr_linenumber" name="49" href="#49">49</a>
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory.getLog(TestIPv6NIOServerSocketChannel.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.junit.Rule;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.junit.experimental.categories.Category;
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.junit.rules.TestRule;
+<a class="jxr_linenumber" name="37" href="#37">37</a>
+<a class="jxr_linenumber" name="38" href="#38">38</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="39" href="#39">39</a> <em class="jxr_javadoccomment"> * This tests whether ServerSocketChannel works over ipv6, which Zookeeper</em>
+<a class="jxr_linenumber" name="40" href="#40">40</a> <em class="jxr_javadoccomment"> * depends on. On Windows Oracle JDK 6, creating a ServerSocketChannel throws</em>
+<a class="jxr_linenumber" name="41" href="#41">41</a> <em class="jxr_javadoccomment"> * java.net.SocketException: Address family not supported by protocol family</em>
+<a class="jxr_linenumber" name="42" href="#42">42</a> <em class="jxr_javadoccomment"> * exception. It is a known JVM bug, seems to be only resolved for JDK7:</em>
+<a class="jxr_linenumber" name="43" href="#43">43</a> <em class="jxr_javadoccomment"> * <a href="http://bugs.sun.com/view_bug.do?bug_id=6230761" target="alexandria_uri">http://bugs.sun.com/view_bug.do?bug_id=6230761</a></em>
+<a class="jxr_linenumber" name="44" href="#44">44</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="45" href="#45">45</a> <em class="jxr_javadoccomment"> * For this test, we check that whether we are effected by this bug, and if so</em>
+<a class="jxr_linenumber" name="46" href="#46">46</a> <em class="jxr_javadoccomment"> * the test ensures that we are running with java.net.preferIPv4Stack=true, so</em>
+<a class="jxr_linenumber" name="47" href="#47">47</a> <em class="jxr_javadoccomment"> * that ZK will not fail to bind to ipv6 address using ClientCnxnSocketNIO.</em>
+<a class="jxr_linenumber" name="48" href="#48">48</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="49" href="#49">49</a> @Category({MiscTests.<strong class="jxr_keyword">class</strong>, SmallTests.<strong class="jxr_keyword">class</strong>})
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html">TestIPv6NIOServerSocketChannel</a> {
<a class="jxr_linenumber" name="51" href="#51">51</a>
-<a class="jxr_linenumber" name="52" href="#52">52</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="53" href="#53">53</a> <em class="jxr_javadoccomment"> * Creates and binds a regular ServerSocket.</em>
-<a class="jxr_linenumber" name="54" href="#54">54</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> bindServerSocket(InetAddress inetAddr) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">while</strong>(<strong class="jxr_keyword">true</strong>) {
-<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">int</strong> port = HBaseTestingUtility.randomFreePort();
-<a class="jxr_linenumber" name="58" href="#58">58</a> InetSocketAddress addr = <strong class="jxr_keyword">new</strong> InetSocketAddress(inetAddr, port);
-<a class="jxr_linenumber" name="59" href="#59">59</a> ServerSocket serverSocket = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="61" href="#61">61</a> serverSocket = <strong class="jxr_keyword">new</strong> ServerSocket();
-<a class="jxr_linenumber" name="62" href="#62">62</a> serverSocket.bind(addr);
-<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="64" href="#64">64</a> } <strong class="jxr_keyword">catch</strong> (BindException ex) {
-<a class="jxr_linenumber" name="65" href="#65">65</a> <em class="jxr_comment">//continue</em>
-<a class="jxr_linenumber" name="66" href="#66">66</a> } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">if</strong> (serverSocket != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="68" href="#68">68</a> serverSocket.close();
-<a class="jxr_linenumber" name="69" href="#69">69</a> }
-<a class="jxr_linenumber" name="70" href="#70">70</a> }
-<a class="jxr_linenumber" name="71" href="#71">71</a> }
-<a class="jxr_linenumber" name="72" href="#72">72</a> }
-<a class="jxr_linenumber" name="73" href="#73">73</a>
-<a class="jxr_linenumber" name="74" href="#74">74</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="75" href="#75">75</a> <em class="jxr_javadoccomment"> * Creates a NIO ServerSocketChannel, and gets the ServerSocket from</em>
-<a class="jxr_linenumber" name="76" href="#76">76</a> <em class="jxr_javadoccomment"> * there. Then binds the obtained socket.</em>
-<a class="jxr_linenumber" name="77" href="#77">77</a> <em class="jxr_javadoccomment"> * This fails on Windows with Oracle JDK1.6.0u33, if the passed InetAddress is a</em>
-<a class="jxr_linenumber" name="78" href="#78">78</a> <em class="jxr_javadoccomment"> * IPv6 address. Works on Oracle JDK 1.7.</em>
-<a class="jxr_linenumber" name="79" href="#79">79</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> bindNIOServerSocket(InetAddress inetAddr) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
-<a class="jxr_linenumber" name="82" href="#82">82</a> <strong class="jxr_keyword">int</strong> port = HBaseTestingUtility.randomFreePort();
-<a class="jxr_linenumber" name="83" href="#83">83</a> InetSocketAddress addr = <strong class="jxr_keyword">new</strong> InetSocketAddress(inetAddr, port);
-<a class="jxr_linenumber" name="84" href="#84">84</a> ServerSocketChannel channel = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="85" href="#85">85</a> ServerSocket serverSocket = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="87" href="#87">87</a> channel = ServerSocketChannel.open();
-<a class="jxr_linenumber" name="88" href="#88">88</a> serverSocket = channel.socket();
-<a class="jxr_linenumber" name="89" href="#89">89</a> serverSocket.bind(addr); <em class="jxr_comment">// This does not work</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="91" href="#91">91</a> } <strong class="jxr_keyword">catch</strong> (BindException ex) {
-<a class="jxr_linenumber" name="92" href="#92">92</a> <em class="jxr_comment">//continue</em>
-<a class="jxr_linenumber" name="93" href="#93">93</a> } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">if</strong> (serverSocket != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="95" href="#95">95</a> serverSocket.close();
-<a class="jxr_linenumber" name="96" href="#96">96</a> }
-<a class="jxr_linenumber" name="97" href="#97">97</a> <strong class="jxr_keyword">if</strong> (channel != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="98" href="#98">98</a> channel.close();
-<a class="jxr_linenumber" name="99" href="#99">99</a> }
-<a class="jxr_linenumber" name="100" href="#100">100</a> }
-<a class="jxr_linenumber" name="101" href="#101">101</a> }
-<a class="jxr_linenumber" name="102" href="#102">102</a> }
-<a class="jxr_linenumber" name="103" href="#103">103</a>
-<a class="jxr_linenumber" name="104" href="#104">104</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="105" href="#105">105</a> <em class="jxr_javadoccomment"> * Checks whether we are effected by the JDK issue on windows, and if so</em>
-<a class="jxr_linenumber" name="106" href="#106">106</a> <em class="jxr_javadoccomment"> * ensures that we are running with preferIPv4Stack=true.</em>
-<a class="jxr_linenumber" name="107" href="#107">107</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="108" href="#108">108</a> @Test
-<a class="jxr_linenumber" name="109" href="#109">109</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testServerSocket() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="110" href="#110">110</a> byte[] addr = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
-<a class="jxr_linenumber" name="111" href="#111">111</a> InetAddress inetAddr = InetAddress.getByAddress(addr);
-<a class="jxr_linenumber" name="112" href="#112">112</a>
-<a class="jxr_linenumber" name="113" href="#113">113</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="114" href="#114">114</a> bindServerSocket(inetAddr);
-<a class="jxr_linenumber" name="115" href="#115">115</a> bindNIOServerSocket(inetAddr);
-<a class="jxr_linenumber" name="116" href="#116">116</a> <em class="jxr_comment">//if on *nix or windows JDK7, both will pass</em>
-<a class="jxr_linenumber" name="117" href="#117">117</a> } <strong class="jxr_keyword">catch</strong>(java.net.SocketException ex) {
-<a class="jxr_linenumber" name="118" href="#118">118</a> <em class="jxr_comment">//On Windows JDK6, we will get expected exception:</em>
-<a class="jxr_linenumber" name="119" href="#119">119</a> <em class="jxr_comment">//java.net.SocketException: Address family not supported by protocol family</em>
-<a class="jxr_linenumber" name="120" href="#120">120</a> <em class="jxr_comment">//or java.net.SocketException: Protocol family not supported</em>
-<a class="jxr_linenumber" name="121" href="#121">121</a> Assert.assertFalse(ex.getClass().isInstance(BindException.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="122" href="#122">122</a> Assert.assertTrue(ex.getMessage().toLowerCase().contains(<span class="jxr_string">"protocol family"</span>));
-<a class="jxr_linenumber" name="123" href="#123">123</a> LOG.info(<span class="jxr_string">"Received expected exception:"</span>);
-<a class="jxr_linenumber" name="124" href="#124">124</a> LOG.info(ex);
-<a class="jxr_linenumber" name="125" href="#125">125</a>
-<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_comment">//if this is the case, ensure that we are running on preferIPv4=true</em>
-<a class="jxr_linenumber" name="127" href="#127">127</a> ensurePreferIPv4();
-<a class="jxr_linenumber" name="128" href="#128">128</a> }
-<a class="jxr_linenumber" name="129" href="#129">129</a> }
+<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory.getLog(TestIPv6NIOServerSocketChannel.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="53" href="#53">53</a>
+<a class="jxr_linenumber" name="54" href="#54">54</a> @Rule
+<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> TestRule timeout = CategoryBasedTimeout.builder().
+<a class="jxr_linenumber" name="56" href="#56">56</a> withTimeout(<strong class="jxr_keyword">this</strong>.getClass()).withLookingForStuckThread(<strong class="jxr_keyword">true</strong>).build();
+<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="58" href="#58">58</a> <em class="jxr_javadoccomment"> * Creates and binds a regular ServerSocket.</em>
+<a class="jxr_linenumber" name="59" href="#59">59</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> bindServerSocket(InetAddress inetAddr) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="61" href="#61">61</a> <strong class="jxr_keyword">while</strong>(<strong class="jxr_keyword">true</strong>) {
+<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">int</strong> port = HBaseTestingUtility.randomFreePort();
+<a class="jxr_linenumber" name="63" href="#63">63</a> InetSocketAddress addr = <strong class="jxr_keyword">new</strong> InetSocketAddress(inetAddr, port);
+<a class="jxr_linenumber" name="64" href="#64">64</a> ServerSocket serverSocket = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="66" href="#66">66</a> serverSocket = <strong class="jxr_keyword">new</strong> ServerSocket();
+<a class="jxr_linenumber" name="67" href="#67">67</a> serverSocket.bind(addr);
+<a class="jxr_linenumber" name="68" href="#68">68</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="69" href="#69">69</a> } <strong class="jxr_keyword">catch</strong> (BindException ex) {
+<a class="jxr_linenumber" name="70" href="#70">70</a> <em class="jxr_comment">//continue</em>
+<a class="jxr_linenumber" name="71" href="#71">71</a> } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">if</strong> (serverSocket != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="73" href="#73">73</a> serverSocket.close();
+<a class="jxr_linenumber" name="74" href="#74">74</a> }
+<a class="jxr_linenumber" name="75" href="#75">75</a> }
+<a class="jxr_linenumber" name="76" href="#76">76</a> }
+<a class="jxr_linenumber" name="77" href="#77">77</a> }
+<a class="jxr_linenumber" name="78" href="#78">78</a>
+<a class="jxr_linenumber" name="79" href="#79">79</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="80" href="#80">80</a> <em class="jxr_javadoccomment"> * Creates a NIO ServerSocketChannel, and gets the ServerSocket from</em>
+<a class="jxr_linenumber" name="81" href="#81">81</a> <em class="jxr_javadoccomment"> * there. Then binds the obtained socket.</em>
+<a class="jxr_linenumber" name="82" href="#82">82</a> <em class="jxr_javadoccomment"> * This fails on Windows with Oracle JDK1.6.0u33, if the passed InetAddress is a</em>
+<a class="jxr_linenumber" name="83" href="#83">83</a> <em class="jxr_javadoccomment"> * IPv6 address. Works on Oracle JDK 1.7.</em>
+<a class="jxr_linenumber" name="84" href="#84">84</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="85" href="#85">85</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> bindNIOServerSocket(InetAddress inetAddr) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
+<a class="jxr_linenumber" name="87" href="#87">87</a> <strong class="jxr_keyword">int</strong> port = HBaseTestingUtility.randomFreePort();
+<a class="jxr_linenumber" name="88" href="#88">88</a> InetSocketAddress addr = <strong class="jxr_keyword">new</strong> InetSocketAddress(inetAddr, port);
+<a class="jxr_linenumber" name="89" href="#89">89</a> ServerSocketChannel channel = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="90" href="#90">90</a> ServerSocket serverSocket = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="92" href="#92">92</a> channel = ServerSocketChannel.open();
+<a class="jxr_linenumber" name="93" href="#93">93</a> serverSocket = channel.socket();
+<a class="jxr_linenumber" name="94" href="#94">94</a> serverSocket.bind(addr); <em class="jxr_comment">// This does not work</em>
+<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="96" href="#96">96</a> } <strong class="jxr_keyword">catch</strong> (BindException ex) {
+<a class="jxr_linenumber" name="97" href="#97">97</a> <em class="jxr_comment">//continue</em>
+<a class="jxr_linenumber" name="98" href="#98">98</a> } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">if</strong> (serverSocket != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="100" href="#100">100</a> serverSocket.close();
+<a class="jxr_linenumber" name="101" href="#101">101</a> }
+<a class="jxr_linenumber" name="102" href="#102">102</a> <strong class="jxr_keyword">if</strong> (channel != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="103" href="#103">103</a> channel.close();
+<a class="jxr_linenumber" name="104" href="#104">104</a> }
+<a class="jxr_linenumber" name="105" href="#105">105</a> }
+<a class="jxr_linenumber" name="106" href="#106">106</a> }
+<a class="jxr_linenumber" name="107" href="#107">107</a> }
+<a class="jxr_linenumber" name="108" href="#108">108</a>
+<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="110" href="#110">110</a> <em class="jxr_javadoccomment"> * Checks whether we are effected by the JDK issue on windows, and if so</em>
+<a class="jxr_linenumber" name="111" href="#111">111</a> <em class="jxr_javadoccomment"> * ensures that we are running with preferIPv4Stack=true.</em>
+<a class="jxr_linenumber" name="112" href="#112">112</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="113" href="#113">113</a> @Test
+<a class="jxr_linenumber" name="114" href="#114">114</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testServerSocket() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="115" href="#115">115</a> byte[] addr = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
+<a class="jxr_linenumber" name="116" href="#116">116</a> InetAddress inetAddr = InetAddress.getByAddress(addr);
+<a class="jxr_linenumber" name="117" href="#117">117</a>
+<a class="jxr_linenumber" name="118" href="#118">118</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="119" href="#119">119</a> bindServerSocket(inetAddr);
+<a class="jxr_linenumber" name="120" href="#120">120</a> bindNIOServerSocket(inetAddr);
+<a class="jxr_linenumber" name="121" href="#121">121</a> <em class="jxr_comment">//if on *nix or windows JDK7, both will pass</em>
+<a class="jxr_linenumber" name="122" href="#122">122</a> } <strong class="jxr_keyword">catch</strong>(java.net.SocketException ex) {
+<a class="jxr_linenumber" name="123" href="#123">123</a> <em class="jxr_comment">//On Windows JDK6, we will get expected exception:</em>
+<a class="jxr_linenumber" name="124" href="#124">124</a> <em class="jxr_comment">//java.net.SocketException: Address family not supported by protocol family</em>
+<a class="jxr_linenumber" name="125" href="#125">125</a> <em class="jxr_comment">//or java.net.SocketException: Protocol family not supported</em>
+<a class="jxr_linenumber" name="126" href="#126">126</a> Assert.assertFalse(ex.getClass().isInstance(BindException.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="127" href="#127">127</a> Assert.assertTrue(ex.getMessage().toLowerCase().contains(<span class="jxr_string">"protocol family"</span>));
+<a class="jxr_linenumber" name="128" href="#128">128</a> LOG.info(<span class="jxr_string">"Received expected exception:"</span>);
+<a class="jxr_linenumber" name="129" href="#129">129</a> LOG.info(ex);
<a class="jxr_linenumber" name="130" href="#130">130</a>
-<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="132" href="#132">132</a> <em class="jxr_javadoccomment"> * Checks whether we are running with java.net.preferIPv4Stack=true</em>
-<a class="jxr_linenumber" name="133" href="#133">133</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="134" href="#134">134</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> ensurePreferIPv4() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="135" href="#135">135</a> InetAddress[] addrs = InetAddress.getAllByName(<span class="jxr_string">"localhost"</span>);
-<a class="jxr_linenumber" name="136" href="#136">136</a> <strong class="jxr_keyword">for</strong> (InetAddress addr : addrs) {
-<a class="jxr_linenumber" name="137" href="#137">137</a> LOG.info(<span class="jxr_string">"resolved localhost as:"</span> + addr);
-<a class="jxr_linenumber" name="138" href="#138">138</a> Assert.assertEquals(4, addr.getAddress().length); <em class="jxr_comment">//ensure 4 byte ipv4 address</em>
-<a class="jxr_linenumber" name="139" href="#139">139</a> }
-<a class="jxr_linenumber" name="140" href="#140">140</a> }
-<a class="jxr_linenumber" name="141" href="#141">141</a>
-<a class="jxr_linenumber" name="142" href="#142">142</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="143" href="#143">143</a> <em class="jxr_javadoccomment"> * Tests whether every InetAddress we obtain by resolving can open a</em>
-<a class="jxr_linenumber" name="144" href="#144">144</a> <em class="jxr_javadoccomment"> * ServerSocketChannel.</em>
-<a class="jxr_linenumber" name="145" href="#145">145</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="146" href="#146">146</a> @Test
-<a class="jxr_linenumber" name="147" href="#147">147</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testServerSocketFromLocalhostResolution() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="148" href="#148">148</a> InetAddress[] addrs = InetAddress.getAllByName(<span class="jxr_string">"localhost"</span>);
-<a class="jxr_linenumber" name="149" href="#149">149</a> <strong class="jxr_keyword">for</strong> (InetAddress addr : addrs) {
-<a class="jxr_linenumber" name="150" href="#150">150</a> LOG.info(<span class="jxr_string">"resolved localhost as:"</span> + addr);
-<a class="jxr_linenumber" name="151" href="#151">151</a> bindServerSocket(addr);
-<a class="jxr_linenumber" name="152" href="#152">152</a> bindNIOServerSocket(addr);
-<a class="jxr_linenumber" name="153" href="#153">153</a> }
-<a class="jxr_linenumber" name="154" href="#154">154</a> }
-<a class="jxr_linenumber" name="155" href="#155">155</a>
-<a class="jxr_linenumber" name="156" href="#156">156</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> main(String[] args) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="157" href="#157">157</a> <a href="../../../../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html">TestIPv6NIOServerSocketChannel</a> test = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html">TestIPv6NIOServerSocketChannel</a>();
-<a class="jxr_linenumber" name="158" href="#158">158</a> test.testServerSocket();
-<a class="jxr_linenumber" name="159" href="#159">159</a> test.testServerSocketFromLocalhostResolution();
-<a class="jxr_linenumber" name="160" href="#160">160</a> }
-<a class="jxr_linenumber" name="161" href="#161">161</a> }
+<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_comment">//if this is the case, ensure that we are running on preferIPv4=true</em>
+<a class="jxr_linenumber" name="132" href="#132">132</a> ensurePreferIPv4();
+<a class="jxr_linenumber" name="133" href="#133">133</a> }
+<a class="jxr_linenumber" name="134" href="#134">134</a> }
+<a class="jxr_linenumber" name="135" href="#135">135</a>
+<a class="jxr_linenumber" name="136" href="#136">136</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="137" href="#137">137</a> <em class="jxr_javadoccomment"> * Checks whether we are running with java.net.preferIPv4Stack=true</em>
+<a class="jxr_linenumber" name="138" href="#138">138</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="139" href="#139">139</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> ensurePreferIPv4() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="140" href="#140">140</a> InetAddress[] addrs = InetAddress.getAllByName(<span class="jxr_string">"localhost"</span>);
+<a class="jxr_linenumber" name="141" href="#141">141</a> <strong class="jxr_keyword">for</strong> (InetAddress addr : addrs) {
+<a class="jxr_linenumber" name="142" href="#142">142</a> LOG.info(<span class="jxr_string">"resolved localhost as:"</span> + addr);
+<a class="jxr_linenumber" name="143" href="#143">143</a> Assert.assertEquals(4, addr.getAddress().length); <em class="jxr_comment">//ensure 4 byte ipv4 address</em>
+<a class="jxr_linenumber" name="144" href="#144">144</a> }
+<a class="jxr_linenumber" name="145" href="#145">145</a> }
+<a class="jxr_linenumber" name="146" href="#146">146</a>
+<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="148" href="#148">148</a> <em class="jxr_javadoccomment"> * Tests whether every InetAddress we obtain by resolving can open a</em>
+<a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_javadoccomment"> * ServerSocketChannel.</em>
+<a class="jxr_linenumber" name="150" href="#150">150</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="151" href="#151">151</a> @Test
+<a class="jxr_linenumber" name="152" href="#152">152</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testServerSocketFromLocalhostResolution() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="153" href="#153">153</a> InetAddress[] addrs = InetAddress.getAllByName(<span class="jxr_string">"localhost"</span>);
+<a class="jxr_linenumber" name="154" href="#154">154</a> <strong class="jxr_keyword">for</strong> (InetAddress addr : addrs) {
+<a class="jxr_linenumber" name="155" href="#155">155</a> LOG.info(<span class="jxr_string">"resolved localhost as:"</span> + addr);
+<a class="jxr_linenumber" name="156" href="#156">156</a> bindServerSocket(addr);
+<a class="jxr_linenumber" name="157" href="#157">157</a> bindNIOServerSocket(addr);
+<a class="jxr_linenumber" name="158" href="#158">158</a> }
+<a class="jxr_linenumber" name="159" href="#159">159</a> }
+<a class="jxr_linenumber" name="160" href="#160">160</a>
+<a class="jxr_linenumber" name="161" href="#161">161</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> main(String[] args) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="162" href="#162">162</a> <a href="../../../../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html">TestIPv6NIOServerSocketChannel</a> test = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html">TestIPv6NIOServerSocketChannel</a>();
+<a class="jxr_linenumber" name="163" href="#163">163</a> test.testServerSocket();
+<a class="jxr_linenumber" name="164" href="#164">164</a> test.testServerSocketFromLocalhostResolution();
+<a class="jxr_linenumber" name="165" href="#165">165</a> }
+<a class="jxr_linenumber" name="166" href="#166">166</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
[14/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
index 46c00c7..f1ce24d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
@@ -33,10 +33,10 @@
<span class="sourceLineNo">025</span> requiredArguments = {<a name="line.25"></a>
<span class="sourceLineNo">026</span> @org.jamon.annotations.Argument(name = "regionServer", type = "HRegionServer")},<a name="line.26"></a>
<span class="sourceLineNo">027</span> optionalArguments = {<a name="line.27"></a>
-<span class="sourceLineNo">028</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.28"></a>
-<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.29"></a>
-<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.30"></a>
-<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "bcn", type = "String")})<a name="line.31"></a>
+<span class="sourceLineNo">028</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.28"></a>
+<span class="sourceLineNo">029</span> @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.29"></a>
+<span class="sourceLineNo">030</span> @org.jamon.annotations.Argument(name = "bcn", type = "String"),<a name="line.30"></a>
+<span class="sourceLineNo">031</span> @org.jamon.annotations.Argument(name = "format", type = "String")})<a name="line.31"></a>
<span class="sourceLineNo">032</span>public class RSStatusTmpl<a name="line.32"></a>
<span class="sourceLineNo">033</span> extends org.jamon.AbstractTemplateProxy<a name="line.33"></a>
<span class="sourceLineNo">034</span>{<a name="line.34"></a>
@@ -77,74 +77,74 @@
<span class="sourceLineNo">069</span> return m_regionServer;<a name="line.69"></a>
<span class="sourceLineNo">070</span> }<a name="line.70"></a>
<span class="sourceLineNo">071</span> private HRegionServer m_regionServer;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> // 22, 1<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public void setFormat(String format)<a name="line.73"></a>
+<span class="sourceLineNo">072</span> // 21, 1<a name="line.72"></a>
+<span class="sourceLineNo">073</span> public void setFilter(String filter)<a name="line.73"></a>
<span class="sourceLineNo">074</span> {<a name="line.74"></a>
-<span class="sourceLineNo">075</span> // 22, 1<a name="line.75"></a>
-<span class="sourceLineNo">076</span> m_format = format;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> m_format__IsNotDefault = true;<a name="line.77"></a>
+<span class="sourceLineNo">075</span> // 21, 1<a name="line.75"></a>
+<span class="sourceLineNo">076</span> m_filter = filter;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> m_filter__IsNotDefault = true;<a name="line.77"></a>
<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span> public String getFormat()<a name="line.79"></a>
+<span class="sourceLineNo">079</span> public String getFilter()<a name="line.79"></a>
<span class="sourceLineNo">080</span> {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return m_format;<a name="line.81"></a>
+<span class="sourceLineNo">081</span> return m_filter;<a name="line.81"></a>
<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private String m_format;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> public boolean getFormat__IsNotDefault()<a name="line.84"></a>
+<span class="sourceLineNo">083</span> private String m_filter;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> public boolean getFilter__IsNotDefault()<a name="line.84"></a>
<span class="sourceLineNo">085</span> {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> return m_format__IsNotDefault;<a name="line.86"></a>
+<span class="sourceLineNo">086</span> return m_filter__IsNotDefault;<a name="line.86"></a>
<span class="sourceLineNo">087</span> }<a name="line.87"></a>
-<span class="sourceLineNo">088</span> private boolean m_format__IsNotDefault;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // 21, 1<a name="line.89"></a>
-<span class="sourceLineNo">090</span> public void setFilter(String filter)<a name="line.90"></a>
+<span class="sourceLineNo">088</span> private boolean m_filter__IsNotDefault;<a name="line.88"></a>
+<span class="sourceLineNo">089</span> // 24, 1<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public void setBcv(String bcv)<a name="line.90"></a>
<span class="sourceLineNo">091</span> {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // 21, 1<a name="line.92"></a>
-<span class="sourceLineNo">093</span> m_filter = filter;<a name="line.93"></a>
-<span class="sourceLineNo">094</span> m_filter__IsNotDefault = true;<a name="line.94"></a>
+<span class="sourceLineNo">092</span> // 24, 1<a name="line.92"></a>
+<span class="sourceLineNo">093</span> m_bcv = bcv;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> m_bcv__IsNotDefault = true;<a name="line.94"></a>
<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public String getFilter()<a name="line.96"></a>
+<span class="sourceLineNo">096</span> public String getBcv()<a name="line.96"></a>
<span class="sourceLineNo">097</span> {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> return m_filter;<a name="line.98"></a>
+<span class="sourceLineNo">098</span> return m_bcv;<a name="line.98"></a>
<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> private String m_filter;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public boolean getFilter__IsNotDefault()<a name="line.101"></a>
+<span class="sourceLineNo">100</span> private String m_bcv;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> public boolean getBcv__IsNotDefault()<a name="line.101"></a>
<span class="sourceLineNo">102</span> {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return m_filter__IsNotDefault;<a name="line.103"></a>
+<span class="sourceLineNo">103</span> return m_bcv__IsNotDefault;<a name="line.103"></a>
<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> private boolean m_filter__IsNotDefault;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> // 24, 1<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public void setBcv(String bcv)<a name="line.107"></a>
+<span class="sourceLineNo">105</span> private boolean m_bcv__IsNotDefault;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> // 23, 1<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public void setBcn(String bcn)<a name="line.107"></a>
<span class="sourceLineNo">108</span> {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> // 24, 1<a name="line.109"></a>
-<span class="sourceLineNo">110</span> m_bcv = bcv;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> m_bcv__IsNotDefault = true;<a name="line.111"></a>
+<span class="sourceLineNo">109</span> // 23, 1<a name="line.109"></a>
+<span class="sourceLineNo">110</span> m_bcn = bcn;<a name="line.110"></a>
+<span class="sourceLineNo">111</span> m_bcn__IsNotDefault = true;<a name="line.111"></a>
<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> public String getBcv()<a name="line.113"></a>
+<span class="sourceLineNo">113</span> public String getBcn()<a name="line.113"></a>
<span class="sourceLineNo">114</span> {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return m_bcv;<a name="line.115"></a>
+<span class="sourceLineNo">115</span> return m_bcn;<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private String m_bcv;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public boolean getBcv__IsNotDefault()<a name="line.118"></a>
+<span class="sourceLineNo">117</span> private String m_bcn;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public boolean getBcn__IsNotDefault()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_bcv__IsNotDefault;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_bcn__IsNotDefault;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private boolean m_bcv__IsNotDefault;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> // 23, 1<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public void setBcn(String bcn)<a name="line.124"></a>
+<span class="sourceLineNo">122</span> private boolean m_bcn__IsNotDefault;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> // 22, 1<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public void setFormat(String format)<a name="line.124"></a>
<span class="sourceLineNo">125</span> {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> // 23, 1<a name="line.126"></a>
-<span class="sourceLineNo">127</span> m_bcn = bcn;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> m_bcn__IsNotDefault = true;<a name="line.128"></a>
+<span class="sourceLineNo">126</span> // 22, 1<a name="line.126"></a>
+<span class="sourceLineNo">127</span> m_format = format;<a name="line.127"></a>
+<span class="sourceLineNo">128</span> m_format__IsNotDefault = true;<a name="line.128"></a>
<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span> public String getBcn()<a name="line.130"></a>
+<span class="sourceLineNo">130</span> public String getFormat()<a name="line.130"></a>
<span class="sourceLineNo">131</span> {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> return m_bcn;<a name="line.132"></a>
+<span class="sourceLineNo">132</span> return m_format;<a name="line.132"></a>
<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> private String m_bcn;<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public boolean getBcn__IsNotDefault()<a name="line.135"></a>
+<span class="sourceLineNo">134</span> private String m_format;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> public boolean getFormat__IsNotDefault()<a name="line.135"></a>
<span class="sourceLineNo">136</span> {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return m_bcn__IsNotDefault;<a name="line.137"></a>
+<span class="sourceLineNo">137</span> return m_format__IsNotDefault;<a name="line.137"></a>
<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> private boolean m_bcn__IsNotDefault;<a name="line.139"></a>
+<span class="sourceLineNo">139</span> private boolean m_format__IsNotDefault;<a name="line.139"></a>
<span class="sourceLineNo">140</span> }<a name="line.140"></a>
<span class="sourceLineNo">141</span> @Override<a name="line.141"></a>
<span class="sourceLineNo">142</span> protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.142"></a>
@@ -156,31 +156,31 @@
<span class="sourceLineNo">148</span> return (ImplData) super.getImplData();<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> protected String format;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.152"></a>
+<span class="sourceLineNo">151</span> protected String filter;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.152"></a>
<span class="sourceLineNo">153</span> {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> (getImplData()).setFormat(p_format);<a name="line.154"></a>
+<span class="sourceLineNo">154</span> (getImplData()).setFilter(p_filter);<a name="line.154"></a>
<span class="sourceLineNo">155</span> return this;<a name="line.155"></a>
<span class="sourceLineNo">156</span> }<a name="line.156"></a>
<span class="sourceLineNo">157</span> <a name="line.157"></a>
-<span class="sourceLineNo">158</span> protected String filter;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFilter(String p_filter)<a name="line.159"></a>
+<span class="sourceLineNo">158</span> protected String bcv;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.159"></a>
<span class="sourceLineNo">160</span> {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> (getImplData()).setFilter(p_filter);<a name="line.161"></a>
+<span class="sourceLineNo">161</span> (getImplData()).setBcv(p_bcv);<a name="line.161"></a>
<span class="sourceLineNo">162</span> return this;<a name="line.162"></a>
<span class="sourceLineNo">163</span> }<a name="line.163"></a>
<span class="sourceLineNo">164</span> <a name="line.164"></a>
-<span class="sourceLineNo">165</span> protected String bcv;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcv(String p_bcv)<a name="line.166"></a>
+<span class="sourceLineNo">165</span> protected String bcn;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.166"></a>
<span class="sourceLineNo">167</span> {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> (getImplData()).setBcv(p_bcv);<a name="line.168"></a>
+<span class="sourceLineNo">168</span> (getImplData()).setBcn(p_bcn);<a name="line.168"></a>
<span class="sourceLineNo">169</span> return this;<a name="line.169"></a>
<span class="sourceLineNo">170</span> }<a name="line.170"></a>
<span class="sourceLineNo">171</span> <a name="line.171"></a>
-<span class="sourceLineNo">172</span> protected String bcn;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.173"></a>
+<span class="sourceLineNo">172</span> protected String format;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.173"></a>
<span class="sourceLineNo">174</span> {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> (getImplData()).setBcn(p_bcn);<a name="line.175"></a>
+<span class="sourceLineNo">175</span> (getImplData()).setFormat(p_format);<a name="line.175"></a>
<span class="sourceLineNo">176</span> return this;<a name="line.176"></a>
<span class="sourceLineNo">177</span> }<a name="line.177"></a>
<span class="sourceLineNo">178</span> <a name="line.178"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
index d805108..42bf74e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
@@ -34,27 +34,27 @@
<span class="sourceLineNo">026</span><a name="line.26"></a>
<span class="sourceLineNo">027</span>{<a name="line.27"></a>
<span class="sourceLineNo">028</span> private final HRegionServer regionServer;<a name="line.28"></a>
-<span class="sourceLineNo">029</span> private final String format;<a name="line.29"></a>
-<span class="sourceLineNo">030</span> private final String filter;<a name="line.30"></a>
-<span class="sourceLineNo">031</span> private final String bcv;<a name="line.31"></a>
-<span class="sourceLineNo">032</span> private final String bcn;<a name="line.32"></a>
+<span class="sourceLineNo">029</span> private final String filter;<a name="line.29"></a>
+<span class="sourceLineNo">030</span> private final String bcv;<a name="line.30"></a>
+<span class="sourceLineNo">031</span> private final String bcn;<a name="line.31"></a>
+<span class="sourceLineNo">032</span> private final String format;<a name="line.32"></a>
<span class="sourceLineNo">033</span> protected static org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData p_implData)<a name="line.33"></a>
<span class="sourceLineNo">034</span> {<a name="line.34"></a>
-<span class="sourceLineNo">035</span> if(! p_implData.getFormat__IsNotDefault())<a name="line.35"></a>
+<span class="sourceLineNo">035</span> if(! p_implData.getFilter__IsNotDefault())<a name="line.35"></a>
<span class="sourceLineNo">036</span> {<a name="line.36"></a>
-<span class="sourceLineNo">037</span> p_implData.setFormat("html");<a name="line.37"></a>
+<span class="sourceLineNo">037</span> p_implData.setFilter("general");<a name="line.37"></a>
<span class="sourceLineNo">038</span> }<a name="line.38"></a>
-<span class="sourceLineNo">039</span> if(! p_implData.getFilter__IsNotDefault())<a name="line.39"></a>
+<span class="sourceLineNo">039</span> if(! p_implData.getBcv__IsNotDefault())<a name="line.39"></a>
<span class="sourceLineNo">040</span> {<a name="line.40"></a>
-<span class="sourceLineNo">041</span> p_implData.setFilter("general");<a name="line.41"></a>
+<span class="sourceLineNo">041</span> p_implData.setBcv("");<a name="line.41"></a>
<span class="sourceLineNo">042</span> }<a name="line.42"></a>
-<span class="sourceLineNo">043</span> if(! p_implData.getBcv__IsNotDefault())<a name="line.43"></a>
+<span class="sourceLineNo">043</span> if(! p_implData.getBcn__IsNotDefault())<a name="line.43"></a>
<span class="sourceLineNo">044</span> {<a name="line.44"></a>
-<span class="sourceLineNo">045</span> p_implData.setBcv("");<a name="line.45"></a>
+<span class="sourceLineNo">045</span> p_implData.setBcn("");<a name="line.45"></a>
<span class="sourceLineNo">046</span> }<a name="line.46"></a>
-<span class="sourceLineNo">047</span> if(! p_implData.getBcn__IsNotDefault())<a name="line.47"></a>
+<span class="sourceLineNo">047</span> if(! p_implData.getFormat__IsNotDefault())<a name="line.47"></a>
<span class="sourceLineNo">048</span> {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> p_implData.setBcn("");<a name="line.49"></a>
+<span class="sourceLineNo">049</span> p_implData.setFormat("html");<a name="line.49"></a>
<span class="sourceLineNo">050</span> }<a name="line.50"></a>
<span class="sourceLineNo">051</span> return p_implData;<a name="line.51"></a>
<span class="sourceLineNo">052</span> }<a name="line.52"></a>
@@ -62,10 +62,10 @@
<span class="sourceLineNo">054</span> {<a name="line.54"></a>
<span class="sourceLineNo">055</span> super(p_templateManager, __jamon_setOptionalArguments(p_implData));<a name="line.55"></a>
<span class="sourceLineNo">056</span> regionServer = p_implData.getRegionServer();<a name="line.56"></a>
-<span class="sourceLineNo">057</span> format = p_implData.getFormat();<a name="line.57"></a>
-<span class="sourceLineNo">058</span> filter = p_implData.getFilter();<a name="line.58"></a>
-<span class="sourceLineNo">059</span> bcv = p_implData.getBcv();<a name="line.59"></a>
-<span class="sourceLineNo">060</span> bcn = p_implData.getBcn();<a name="line.60"></a>
+<span class="sourceLineNo">057</span> filter = p_implData.getFilter();<a name="line.57"></a>
+<span class="sourceLineNo">058</span> bcv = p_implData.getBcv();<a name="line.58"></a>
+<span class="sourceLineNo">059</span> bcn = p_implData.getBcn();<a name="line.59"></a>
+<span class="sourceLineNo">060</span> format = p_implData.getFormat();<a name="line.60"></a>
<span class="sourceLineNo">061</span> }<a name="line.61"></a>
<span class="sourceLineNo">062</span> <a name="line.62"></a>
<span class="sourceLineNo">063</span> @Override public void renderNoFlush(final java.io.Writer jamonWriter)<a name="line.63"></a>
@@ -94,8 +94,8 @@
<span class="sourceLineNo">086</span> // 41, 3<a name="line.86"></a>
<span class="sourceLineNo">087</span> {<a name="line.87"></a>
<span class="sourceLineNo">088</span> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl __jamon__var_1 = new org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl(this.getTemplateManager());<a name="line.88"></a>
-<span class="sourceLineNo">089</span> __jamon__var_1.setFormat("json" );<a name="line.89"></a>
-<span class="sourceLineNo">090</span> __jamon__var_1.setFilter(filter);<a name="line.90"></a>
+<span class="sourceLineNo">089</span> __jamon__var_1.setFilter(filter);<a name="line.89"></a>
+<span class="sourceLineNo">090</span> __jamon__var_1.setFormat("json" );<a name="line.90"></a>
<span class="sourceLineNo">091</span> __jamon__var_1.renderNoFlush(jamonWriter);<a name="line.91"></a>
<span class="sourceLineNo">092</span> }<a name="line.92"></a>
<span class="sourceLineNo">093</span> // 41, 68<a name="line.93"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/distribution-management.html
----------------------------------------------------------------------
diff --git a/distribution-management.html b/distribution-management.html
index 40e68b7..7640405 100644
--- a/distribution-management.html
+++ b/distribution-management.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Distribution Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -290,7 +290,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/export_control.html
----------------------------------------------------------------------
diff --git a/export_control.html b/export_control.html
index b2295e8..f1969d3 100644
--- a/export_control.html
+++ b/export_control.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Export Control
@@ -330,7 +330,7 @@ for more details.</p>
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/checkstyle.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/checkstyle.html b/hbase-annotations/checkstyle.html
index 2e14b46..171f077 100644
--- a/hbase-annotations/checkstyle.html
+++ b/hbase-annotations/checkstyle.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/dependencies.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependencies.html b/hbase-annotations/dependencies.html
index 0600090..b666462 100644
--- a/hbase-annotations/dependencies.html
+++ b/hbase-annotations/dependencies.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-convergence.html b/hbase-annotations/dependency-convergence.html
index 2f16d57..7349296 100644
--- a/hbase-annotations/dependency-convergence.html
+++ b/hbase-annotations/dependency-convergence.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/dependency-info.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-info.html b/hbase-annotations/dependency-info.html
index 5664788..94e6c88 100644
--- a/hbase-annotations/dependency-info.html
+++ b/hbase-annotations/dependency-info.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/dependency-management.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-management.html b/hbase-annotations/dependency-management.html
index b0d968a..ee04d0b 100644
--- a/hbase-annotations/dependency-management.html
+++ b/hbase-annotations/dependency-management.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/distribution-management.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/distribution-management.html b/hbase-annotations/distribution-management.html
index 10a7d52..4c319e6 100644
--- a/hbase-annotations/distribution-management.html
+++ b/hbase-annotations/distribution-management.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/index.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/index.html b/hbase-annotations/index.html
index 53ea53f..7d5f33c 100644
--- a/hbase-annotations/index.html
+++ b/hbase-annotations/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/integration.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/integration.html b/hbase-annotations/integration.html
index 8d1baa6..ef06cab 100644
--- a/hbase-annotations/integration.html
+++ b/hbase-annotations/integration.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/issue-tracking.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/issue-tracking.html b/hbase-annotations/issue-tracking.html
index c54a145..8dbb947 100644
--- a/hbase-annotations/issue-tracking.html
+++ b/hbase-annotations/issue-tracking.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/license.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/license.html b/hbase-annotations/license.html
index 87a0b28..c47939d 100644
--- a/hbase-annotations/license.html
+++ b/hbase-annotations/license.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/mail-lists.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/mail-lists.html b/hbase-annotations/mail-lists.html
index f84c27a..9082a65 100644
--- a/hbase-annotations/mail-lists.html
+++ b/hbase-annotations/mail-lists.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/plugin-management.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/plugin-management.html b/hbase-annotations/plugin-management.html
index 7740543..55c92a3 100644
--- a/hbase-annotations/plugin-management.html
+++ b/hbase-annotations/plugin-management.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/plugins.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/plugins.html b/hbase-annotations/plugins.html
index 8fe7ae2..24f0d5d 100644
--- a/hbase-annotations/plugins.html
+++ b/hbase-annotations/plugins.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/project-info.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/project-info.html b/hbase-annotations/project-info.html
index 0cec6ad..8f16b16 100644
--- a/hbase-annotations/project-info.html
+++ b/hbase-annotations/project-info.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/project-reports.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/project-reports.html b/hbase-annotations/project-reports.html
index 59314ea..e14ca59 100644
--- a/hbase-annotations/project-reports.html
+++ b/hbase-annotations/project-reports.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/project-summary.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/project-summary.html b/hbase-annotations/project-summary.html
index 25aebbe..8bec760 100644
--- a/hbase-annotations/project-summary.html
+++ b/hbase-annotations/project-summary.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/source-repository.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/source-repository.html b/hbase-annotations/source-repository.html
index 05a557d..fccde5c 100644
--- a/hbase-annotations/source-repository.html
+++ b/hbase-annotations/source-repository.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-annotations/team-list.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/team-list.html b/hbase-annotations/team-list.html
index 3918d21..fcc91c3 100644
--- a/hbase-annotations/team-list.html
+++ b/hbase-annotations/team-list.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/checkstyle.html
----------------------------------------------------------------------
diff --git a/hbase-spark/checkstyle.html b/hbase-spark/checkstyle.html
index aa626f8..769cd0e 100644
--- a/hbase-spark/checkstyle.html
+++ b/hbase-spark/checkstyle.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/dependencies.html
----------------------------------------------------------------------
diff --git a/hbase-spark/dependencies.html b/hbase-spark/dependencies.html
index 114fe1f..44313d5 100644
--- a/hbase-spark/dependencies.html
+++ b/hbase-spark/dependencies.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/hbase-spark/dependency-convergence.html b/hbase-spark/dependency-convergence.html
index 702f3ac..4e784eb 100644
--- a/hbase-spark/dependency-convergence.html
+++ b/hbase-spark/dependency-convergence.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/dependency-info.html
----------------------------------------------------------------------
diff --git a/hbase-spark/dependency-info.html b/hbase-spark/dependency-info.html
index c949ec2..c2f284d 100644
--- a/hbase-spark/dependency-info.html
+++ b/hbase-spark/dependency-info.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/dependency-management.html
----------------------------------------------------------------------
diff --git a/hbase-spark/dependency-management.html b/hbase-spark/dependency-management.html
index aa04b61..f76affb 100644
--- a/hbase-spark/dependency-management.html
+++ b/hbase-spark/dependency-management.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/distribution-management.html
----------------------------------------------------------------------
diff --git a/hbase-spark/distribution-management.html b/hbase-spark/distribution-management.html
index 6796892..4c1f757 100644
--- a/hbase-spark/distribution-management.html
+++ b/hbase-spark/distribution-management.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/index.html
----------------------------------------------------------------------
diff --git a/hbase-spark/index.html b/hbase-spark/index.html
index 9c7b19d..bd34714 100644
--- a/hbase-spark/index.html
+++ b/hbase-spark/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/integration.html
----------------------------------------------------------------------
diff --git a/hbase-spark/integration.html b/hbase-spark/integration.html
index a65edbf..32755fe 100644
--- a/hbase-spark/integration.html
+++ b/hbase-spark/integration.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/issue-tracking.html
----------------------------------------------------------------------
diff --git a/hbase-spark/issue-tracking.html b/hbase-spark/issue-tracking.html
index 3c029b7..b232a47 100644
--- a/hbase-spark/issue-tracking.html
+++ b/hbase-spark/issue-tracking.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/license.html
----------------------------------------------------------------------
diff --git a/hbase-spark/license.html b/hbase-spark/license.html
index fffc31f..78911c9 100644
--- a/hbase-spark/license.html
+++ b/hbase-spark/license.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/mail-lists.html
----------------------------------------------------------------------
diff --git a/hbase-spark/mail-lists.html b/hbase-spark/mail-lists.html
index aa355d9..889b0da 100644
--- a/hbase-spark/mail-lists.html
+++ b/hbase-spark/mail-lists.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/plugin-management.html
----------------------------------------------------------------------
diff --git a/hbase-spark/plugin-management.html b/hbase-spark/plugin-management.html
index 6a4005f..156144e 100644
--- a/hbase-spark/plugin-management.html
+++ b/hbase-spark/plugin-management.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/plugins.html
----------------------------------------------------------------------
diff --git a/hbase-spark/plugins.html b/hbase-spark/plugins.html
index da032a5..86d7127 100644
--- a/hbase-spark/plugins.html
+++ b/hbase-spark/plugins.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/project-info.html
----------------------------------------------------------------------
diff --git a/hbase-spark/project-info.html b/hbase-spark/project-info.html
index 8d8fb88..dc50f29 100644
--- a/hbase-spark/project-info.html
+++ b/hbase-spark/project-info.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/project-reports.html
----------------------------------------------------------------------
diff --git a/hbase-spark/project-reports.html b/hbase-spark/project-reports.html
index 160f6e8..646460d 100644
--- a/hbase-spark/project-reports.html
+++ b/hbase-spark/project-reports.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/project-summary.html
----------------------------------------------------------------------
diff --git a/hbase-spark/project-summary.html b/hbase-spark/project-summary.html
index 4cb1699..a540ae7 100644
--- a/hbase-spark/project-summary.html
+++ b/hbase-spark/project-summary.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/source-repository.html
----------------------------------------------------------------------
diff --git a/hbase-spark/source-repository.html b/hbase-spark/source-repository.html
index a98da47..ca9b291 100644
--- a/hbase-spark/source-repository.html
+++ b/hbase-spark/source-repository.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/hbase-spark/team-list.html
----------------------------------------------------------------------
diff --git a/hbase-spark/team-list.html b/hbase-spark/team-list.html
index 4e339c7..f52580a 100644
--- a/hbase-spark/team-list.html
+++ b/hbase-spark/team-list.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-16 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-02-17 -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("./css/site.css");
</style>
<link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -27,7 +27,7 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2016-02-16</span>
+ <span id="publishDate">Last Published: 2016-02-17</span>
| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
</div>
<div class="xright"> <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 8c0429a..836c59c 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBaseâ„¢ Home</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -422,7 +422,7 @@ Apache HBase is an open-source, distributed, versioned, non-relational database
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/integration.html
----------------------------------------------------------------------
diff --git a/integration.html b/integration.html
index 4d2082a..b4a7cdc 100644
--- a/integration.html
+++ b/integration.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Continuous Integration</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -290,7 +290,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/issue-tracking.html
----------------------------------------------------------------------
diff --git a/issue-tracking.html b/issue-tracking.html
index 0bfc243..9844b62 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Issue Tracking</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -287,7 +287,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/license.html
----------------------------------------------------------------------
diff --git a/license.html b/license.html
index 6144cf8..92a195a 100644
--- a/license.html
+++ b/license.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project License</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -490,7 +490,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/mail-lists.html
----------------------------------------------------------------------
diff --git a/mail-lists.html b/mail-lists.html
index 3db8f50..cc541ec 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20160216" />
+ <meta name="Date-Revision-yyyymmdd" content="20160217" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Mailing Lists</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -340,7 +340,7 @@
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2016-02-16</li>
+ <li id="publishDate" class="pull-right">Last Published: 2016-02-17</li>
</p>
</div>
[17/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
index 5386516..545c9d5 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
@@ -379,40 +379,40 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.110">m_master</a></pre>
</li>
</ul>
-<a name="m_format">
+<a name="m_metaLocation">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_format</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.122">m_format</a></pre>
+<h4>m_metaLocation</h4>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.122">m_metaLocation</a></pre>
</li>
</ul>
-<a name="m_format__IsNotDefault">
+<a name="m_metaLocation__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_format__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.127">m_format__IsNotDefault</a></pre>
+<h4>m_metaLocation__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.127">m_metaLocation__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_catalogJanitorEnabled">
+<a name="m_serverManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_catalogJanitorEnabled</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.139">m_catalogJanitorEnabled</a></pre>
+<h4>m_serverManager</h4>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.139">m_serverManager</a></pre>
</li>
</ul>
-<a name="m_catalogJanitorEnabled__IsNotDefault">
+<a name="m_serverManager__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_catalogJanitorEnabled__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.144">m_catalogJanitorEnabled__IsNotDefault</a></pre>
+<h4>m_serverManager__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.144">m_serverManager__IsNotDefault</a></pre>
</li>
</ul>
<a name="m_frags">
@@ -433,112 +433,112 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.161">m_frags__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_filter">
+<a name="m_assignmentManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_filter</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.173">m_filter</a></pre>
+<h4>m_assignmentManager</h4>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.173">m_assignmentManager</a></pre>
</li>
</ul>
-<a name="m_filter__IsNotDefault">
+<a name="m_assignmentManager__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_filter__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.178">m_filter__IsNotDefault</a></pre>
+<h4>m_assignmentManager__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.178">m_assignmentManager__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_assignmentManager">
+<a name="m_format">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_assignmentManager</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.190">m_assignmentManager</a></pre>
+<h4>m_format</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.190">m_format</a></pre>
</li>
</ul>
-<a name="m_assignmentManager__IsNotDefault">
+<a name="m_format__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_assignmentManager__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.195">m_assignmentManager__IsNotDefault</a></pre>
+<h4>m_format__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.195">m_format__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_serverManager">
+<a name="m_catalogJanitorEnabled">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_serverManager</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.207">m_serverManager</a></pre>
+<h4>m_catalogJanitorEnabled</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.207">m_catalogJanitorEnabled</a></pre>
</li>
</ul>
-<a name="m_serverManager__IsNotDefault">
+<a name="m_catalogJanitorEnabled__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_serverManager__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.212">m_serverManager__IsNotDefault</a></pre>
+<h4>m_catalogJanitorEnabled__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.212">m_catalogJanitorEnabled__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_deadServers">
+<a name="m_filter">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_deadServers</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.224">m_deadServers</a></pre>
+<h4>m_filter</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.224">m_filter</a></pre>
</li>
</ul>
-<a name="m_deadServers__IsNotDefault">
+<a name="m_filter__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_deadServers__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.229">m_deadServers__IsNotDefault</a></pre>
+<h4>m_filter__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.229">m_filter__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_servers">
+<a name="m_deadServers">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_servers</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.241">m_servers</a></pre>
+<h4>m_deadServers</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.241">m_deadServers</a></pre>
</li>
</ul>
-<a name="m_servers__IsNotDefault">
+<a name="m_deadServers__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_servers__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.246">m_servers__IsNotDefault</a></pre>
+<h4>m_deadServers__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.246">m_deadServers__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_metaLocation">
+<a name="m_servers">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_metaLocation</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.258">m_metaLocation</a></pre>
+<h4>m_servers</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.258">m_servers</a></pre>
</li>
</ul>
-<a name="m_metaLocation__IsNotDefault">
+<a name="m_servers__IsNotDefault">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>m_metaLocation__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.263">m_metaLocation__IsNotDefault</a></pre>
+<h4>m_servers__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.263">m_servers__IsNotDefault</a></pre>
</li>
</ul>
</li>
@@ -584,58 +584,58 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.106">getMaster</a>()</pre>
</li>
</ul>
-<a name="setFormat(java.lang.String)">
+<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFormat</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.112">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> format)</pre>
+<h4>setMetaLocation</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.112">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> metaLocation)</pre>
</li>
</ul>
-<a name="getFormat()">
+<a name="getMetaLocation()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFormat</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.118">getFormat</a>()</pre>
+<h4>getMetaLocation</h4>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.118">getMetaLocation</a>()</pre>
</li>
</ul>
-<a name="getFormat__IsNotDefault()">
+<a name="getMetaLocation__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFormat__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.123">getFormat__IsNotDefault</a>()</pre>
+<h4>getMetaLocation__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.123">getMetaLocation__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setCatalogJanitorEnabled(boolean)">
+<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setCatalogJanitorEnabled</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.129">setCatalogJanitorEnabled</a>(boolean catalogJanitorEnabled)</pre>
+<h4>setServerManager</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.129">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> serverManager)</pre>
</li>
</ul>
-<a name="getCatalogJanitorEnabled()">
+<a name="getServerManager()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getCatalogJanitorEnabled</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.135">getCatalogJanitorEnabled</a>()</pre>
+<h4>getServerManager</h4>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.135">getServerManager</a>()</pre>
</li>
</ul>
-<a name="getCatalogJanitorEnabled__IsNotDefault()">
+<a name="getServerManager__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getCatalogJanitorEnabled__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.140">getCatalogJanitorEnabled__IsNotDefault</a>()</pre>
+<h4>getServerManager__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.140">getServerManager__IsNotDefault</a>()</pre>
</li>
</ul>
<a name="setFrags(java.util.Map)">
@@ -665,166 +665,166 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.157">getFrags__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setFilter(java.lang.String)">
+<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFilter</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.163">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> filter)</pre>
+<h4>setAssignmentManager</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.163">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> assignmentManager)</pre>
</li>
</ul>
-<a name="getFilter()">
+<a name="getAssignmentManager()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFilter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.169">getFilter</a>()</pre>
+<h4>getAssignmentManager</h4>
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.169">getAssignmentManager</a>()</pre>
</li>
</ul>
-<a name="getFilter__IsNotDefault()">
+<a name="getAssignmentManager__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFilter__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.174">getFilter__IsNotDefault</a>()</pre>
+<h4>getAssignmentManager__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.174">getAssignmentManager__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
+<a name="setFormat(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setAssignmentManager</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.180">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> assignmentManager)</pre>
+<h4>setFormat</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.180">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> format)</pre>
</li>
</ul>
-<a name="getAssignmentManager()">
+<a name="getFormat()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getAssignmentManager</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.186">getAssignmentManager</a>()</pre>
+<h4>getFormat</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.186">getFormat</a>()</pre>
</li>
</ul>
-<a name="getAssignmentManager__IsNotDefault()">
+<a name="getFormat__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getAssignmentManager__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.191">getAssignmentManager__IsNotDefault</a>()</pre>
+<h4>getFormat__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.191">getFormat__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
+<a name="setCatalogJanitorEnabled(boolean)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setServerManager</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.197">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> serverManager)</pre>
+<h4>setCatalogJanitorEnabled</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.197">setCatalogJanitorEnabled</a>(boolean catalogJanitorEnabled)</pre>
</li>
</ul>
-<a name="getServerManager()">
+<a name="getCatalogJanitorEnabled()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getServerManager</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.203">getServerManager</a>()</pre>
+<h4>getCatalogJanitorEnabled</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.203">getCatalogJanitorEnabled</a>()</pre>
</li>
</ul>
-<a name="getServerManager__IsNotDefault()">
+<a name="getCatalogJanitorEnabled__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getServerManager__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.208">getServerManager__IsNotDefault</a>()</pre>
+<h4>getCatalogJanitorEnabled__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.208">getCatalogJanitorEnabled__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setDeadServers(java.util.Set)">
+<a name="setFilter(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setDeadServers</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.214">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> deadServers)</pre>
+<h4>setFilter</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.214">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> filter)</pre>
</li>
</ul>
-<a name="getDeadServers()">
+<a name="getFilter()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getDeadServers</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.220">getDeadServers</a>()</pre>
+<h4>getFilter</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.220">getFilter</a>()</pre>
</li>
</ul>
-<a name="getDeadServers__IsNotDefault()">
+<a name="getFilter__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getDeadServers__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.225">getDeadServers__IsNotDefault</a>()</pre>
+<h4>getFilter__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.225">getFilter__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setServers(java.util.List)">
+<a name="setDeadServers(java.util.Set)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setServers</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.231">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> servers)</pre>
+<h4>setDeadServers</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.231">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> deadServers)</pre>
</li>
</ul>
-<a name="getServers()">
+<a name="getDeadServers()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getServers</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.237">getServers</a>()</pre>
+<h4>getDeadServers</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.237">getDeadServers</a>()</pre>
</li>
</ul>
-<a name="getServers__IsNotDefault()">
+<a name="getDeadServers__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getServers__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.242">getServers__IsNotDefault</a>()</pre>
+<h4>getDeadServers__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.242">getDeadServers__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
+<a name="setServers(java.util.List)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setMetaLocation</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.248">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> metaLocation)</pre>
+<h4>setServers</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.248">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> servers)</pre>
</li>
</ul>
-<a name="getMetaLocation()">
+<a name="getServers()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getMetaLocation</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.254">getMetaLocation</a>()</pre>
+<h4>getServers</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.254">getServers</a>()</pre>
</li>
</ul>
-<a name="getMetaLocation__IsNotDefault()">
+<a name="getServers__IsNotDefault()">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>getMetaLocation__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.259">getMetaLocation__IsNotDefault</a>()</pre>
+<h4>getServers__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.259">getServers__IsNotDefault</a>()</pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
index cca65c8..9b68db2 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
@@ -323,22 +323,22 @@ extends org.jamon.AbstractTemplateProxy</pre>
<!-- -->
</a>
<h3>Field Detail</h3>
-<a name="format">
+<a name="metaLocation">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>format</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.275">format</a></pre>
+<h4>metaLocation</h4>
+<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.275">metaLocation</a></pre>
</li>
</ul>
-<a name="catalogJanitorEnabled">
+<a name="serverManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>catalogJanitorEnabled</h4>
-<pre>protected boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.282">catalogJanitorEnabled</a></pre>
+<h4>serverManager</h4>
+<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.282">serverManager</a></pre>
</li>
</ul>
<a name="frags">
@@ -350,58 +350,58 @@ extends org.jamon.AbstractTemplateProxy</pre>
<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.289">frags</a></pre>
</li>
</ul>
-<a name="filter">
+<a name="assignmentManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>filter</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.296">filter</a></pre>
+<h4>assignmentManager</h4>
+<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.296">assignmentManager</a></pre>
</li>
</ul>
-<a name="assignmentManager">
+<a name="format">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>assignmentManager</h4>
-<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.303">assignmentManager</a></pre>
+<h4>format</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.303">format</a></pre>
</li>
</ul>
-<a name="serverManager">
+<a name="catalogJanitorEnabled">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>serverManager</h4>
-<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.310">serverManager</a></pre>
+<h4>catalogJanitorEnabled</h4>
+<pre>protected boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.310">catalogJanitorEnabled</a></pre>
</li>
</ul>
-<a name="deadServers">
+<a name="filter">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>deadServers</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.317">deadServers</a></pre>
+<h4>filter</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.317">filter</a></pre>
</li>
</ul>
-<a name="servers">
+<a name="deadServers">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>servers</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.324">servers</a></pre>
+<h4>deadServers</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.324">deadServers</a></pre>
</li>
</ul>
-<a name="metaLocation">
+<a name="servers">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>metaLocation</h4>
-<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.331">metaLocation</a></pre>
+<h4>servers</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.331">servers</a></pre>
</li>
</ul>
</li>
@@ -473,22 +473,22 @@ extends org.jamon.AbstractTemplateProxy</pre>
</dl>
</li>
</ul>
-<a name="setFormat(java.lang.String)">
+<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFormat</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.276">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_format)</pre>
+<h4>setMetaLocation</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.276">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> p_metaLocation)</pre>
</li>
</ul>
-<a name="setCatalogJanitorEnabled(boolean)">
+<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setCatalogJanitorEnabled</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.283">setCatalogJanitorEnabled</a>(boolean p_catalogJanitorEnabled)</pre>
+<h4>setServerManager</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.283">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> p_serverManager)</pre>
</li>
</ul>
<a name="setFrags(java.util.Map)">
@@ -500,58 +500,58 @@ extends org.jamon.AbstractTemplateProxy</pre>
<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.290">setFrags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> p_frags)</pre>
</li>
</ul>
-<a name="setFilter(java.lang.String)">
+<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFilter</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.297">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_filter)</pre>
+<h4>setAssignmentManager</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.297">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> p_assignmentManager)</pre>
</li>
</ul>
-<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
+<a name="setFormat(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setAssignmentManager</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.304">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> p_assignmentManager)</pre>
+<h4>setFormat</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.304">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_format)</pre>
</li>
</ul>
-<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
+<a name="setCatalogJanitorEnabled(boolean)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setServerManager</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.311">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> p_serverManager)</pre>
+<h4>setCatalogJanitorEnabled</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.311">setCatalogJanitorEnabled</a>(boolean p_catalogJanitorEnabled)</pre>
</li>
</ul>
-<a name="setDeadServers(java.util.Set)">
+<a name="setFilter(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setDeadServers</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.318">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> p_deadServers)</pre>
+<h4>setFilter</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.318">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_filter)</pre>
</li>
</ul>
-<a name="setServers(java.util.List)">
+<a name="setDeadServers(java.util.Set)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setServers</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.325">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> p_servers)</pre>
+<h4>setDeadServers</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.325">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> p_deadServers)</pre>
</li>
</ul>
-<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
+<a name="setServers(java.util.List)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setMetaLocation</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.332">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> p_metaLocation)</pre>
+<h4>setServers</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.332">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> p_servers)</pre>
</li>
</ul>
<a name="constructImpl(java.lang.Class)">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
index a384403..8dd06c8 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
@@ -264,22 +264,22 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/Master
<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.62">master</a></pre>
</li>
</ul>
-<a name="format">
+<a name="metaLocation">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>format</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.63">format</a></pre>
+<h4>metaLocation</h4>
+<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.63">metaLocation</a></pre>
</li>
</ul>
-<a name="catalogJanitorEnabled">
+<a name="serverManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>catalogJanitorEnabled</h4>
-<pre>private final boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.64">catalogJanitorEnabled</a></pre>
+<h4>serverManager</h4>
+<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.64">serverManager</a></pre>
</li>
</ul>
<a name="frags">
@@ -291,58 +291,58 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/Master
<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.65">frags</a></pre>
</li>
</ul>
-<a name="filter">
+<a name="assignmentManager">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>filter</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.66">filter</a></pre>
+<h4>assignmentManager</h4>
+<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.66">assignmentManager</a></pre>
</li>
</ul>
-<a name="assignmentManager">
+<a name="format">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>assignmentManager</h4>
-<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.67">assignmentManager</a></pre>
+<h4>format</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.67">format</a></pre>
</li>
</ul>
-<a name="serverManager">
+<a name="catalogJanitorEnabled">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>serverManager</h4>
-<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.68">serverManager</a></pre>
+<h4>catalogJanitorEnabled</h4>
+<pre>private final boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.68">catalogJanitorEnabled</a></pre>
</li>
</ul>
-<a name="deadServers">
+<a name="filter">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>deadServers</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.69">deadServers</a></pre>
+<h4>filter</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.69">filter</a></pre>
</li>
</ul>
-<a name="servers">
+<a name="deadServers">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>servers</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.70">servers</a></pre>
+<h4>deadServers</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.70">deadServers</a></pre>
</li>
</ul>
-<a name="metaLocation">
+<a name="servers">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>metaLocation</h4>
-<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.71">metaLocation</a></pre>
+<h4>servers</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.71">servers</a></pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
index 9013517..4cc2ce5 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
@@ -279,76 +279,76 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>private <a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.71">m_regionServer</a></pre>
</li>
</ul>
-<a name="m_format">
+<a name="m_filter">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_format</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.83">m_format</a></pre>
+<h4>m_filter</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.83">m_filter</a></pre>
</li>
</ul>
-<a name="m_format__IsNotDefault">
+<a name="m_filter__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_format__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.88">m_format__IsNotDefault</a></pre>
+<h4>m_filter__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.88">m_filter__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_filter">
+<a name="m_bcv">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_filter</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.100">m_filter</a></pre>
+<h4>m_bcv</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.100">m_bcv</a></pre>
</li>
</ul>
-<a name="m_filter__IsNotDefault">
+<a name="m_bcv__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_filter__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.105">m_filter__IsNotDefault</a></pre>
+<h4>m_bcv__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.105">m_bcv__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_bcv">
+<a name="m_bcn">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_bcv</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.117">m_bcv</a></pre>
+<h4>m_bcn</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.117">m_bcn</a></pre>
</li>
</ul>
-<a name="m_bcv__IsNotDefault">
+<a name="m_bcn__IsNotDefault">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_bcv__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.122">m_bcv__IsNotDefault</a></pre>
+<h4>m_bcn__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.122">m_bcn__IsNotDefault</a></pre>
</li>
</ul>
-<a name="m_bcn">
+<a name="m_format">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>m_bcn</h4>
-<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.134">m_bcn</a></pre>
+<h4>m_format</h4>
+<pre>private <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.134">m_format</a></pre>
</li>
</ul>
-<a name="m_bcn__IsNotDefault">
+<a name="m_format__IsNotDefault">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>m_bcn__IsNotDefault</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.139">m_bcn__IsNotDefault</a></pre>
+<h4>m_format__IsNotDefault</h4>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.139">m_format__IsNotDefault</a></pre>
</li>
</ul>
</li>
@@ -394,112 +394,112 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
<pre>public <a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.67">getRegionServer</a>()</pre>
</li>
</ul>
-<a name="setFormat(java.lang.String)">
+<a name="setFilter(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFormat</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.73">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> format)</pre>
+<h4>setFilter</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.73">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> filter)</pre>
</li>
</ul>
-<a name="getFormat()">
+<a name="getFilter()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFormat</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.79">getFormat</a>()</pre>
+<h4>getFilter</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.79">getFilter</a>()</pre>
</li>
</ul>
-<a name="getFormat__IsNotDefault()">
+<a name="getFilter__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFormat__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.84">getFormat__IsNotDefault</a>()</pre>
+<h4>getFilter__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.84">getFilter__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setFilter(java.lang.String)">
+<a name="setBcv(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setFilter</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.90">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> filter)</pre>
+<h4>setBcv</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.90">setBcv</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> bcv)</pre>
</li>
</ul>
-<a name="getFilter()">
+<a name="getBcv()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFilter</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.96">getFilter</a>()</pre>
+<h4>getBcv</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.96">getBcv</a>()</pre>
</li>
</ul>
-<a name="getFilter__IsNotDefault()">
+<a name="getBcv__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getFilter__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.101">getFilter__IsNotDefault</a>()</pre>
+<h4>getBcv__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.101">getBcv__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setBcv(java.lang.String)">
+<a name="setBcn(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setBcv</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.107">setBcv</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> bcv)</pre>
+<h4>setBcn</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.107">setBcn</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> bcn)</pre>
</li>
</ul>
-<a name="getBcv()">
+<a name="getBcn()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getBcv</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.113">getBcv</a>()</pre>
+<h4>getBcn</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.113">getBcn</a>()</pre>
</li>
</ul>
-<a name="getBcv__IsNotDefault()">
+<a name="getBcn__IsNotDefault()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getBcv__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.118">getBcv__IsNotDefault</a>()</pre>
+<h4>getBcn__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.118">getBcn__IsNotDefault</a>()</pre>
</li>
</ul>
-<a name="setBcn(java.lang.String)">
+<a name="setFormat(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>setBcn</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.124">setBcn</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> bcn)</pre>
+<h4>setFormat</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.124">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> format)</pre>
</li>
</ul>
-<a name="getBcn()">
+<a name="getFormat()">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>getBcn</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.130">getBcn</a>()</pre>
+<h4>getFormat</h4>
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.130">getFormat</a>()</pre>
</li>
</ul>
-<a name="getBcn__IsNotDefault()">
+<a name="getFormat__IsNotDefault()">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>getBcn__IsNotDefault</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.135">getBcn__IsNotDefault</a>()</pre>
+<h4>getFormat__IsNotDefault</h4>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.135">getFormat__IsNotDefault</a>()</pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
index 7dad6c4..0295426 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
@@ -283,40 +283,40 @@ extends org.jamon.AbstractTemplateProxy</pre>
<!-- -->
</a>
<h3>Field Detail</h3>
-<a name="format">
+<a name="filter">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>format</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.151">format</a></pre>
+<h4>filter</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.151">filter</a></pre>
</li>
</ul>
-<a name="filter">
+<a name="bcv">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>filter</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.158">filter</a></pre>
+<h4>bcv</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.158">bcv</a></pre>
</li>
</ul>
-<a name="bcv">
+<a name="bcn">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>bcv</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.165">bcv</a></pre>
+<h4>bcn</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.165">bcn</a></pre>
</li>
</ul>
-<a name="bcn">
+<a name="format">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>bcn</h4>
-<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.172">bcn</a></pre>
+<h4>format</h4>
+<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.172">format</a></pre>
</li>
</ul>
</li>
@@ -388,22 +388,13 @@ extends org.jamon.AbstractTemplateProxy</pre>
</dl>
</li>
</ul>
-<a name="setFormat(java.lang.String)">
-<!-- -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setFormat</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.152">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_format)</pre>
-</li>
-</ul>
<a name="setFilter(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>setFilter</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.159">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_filter)</pre>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.152">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_filter)</pre>
</li>
</ul>
<a name="setBcv(java.lang.String)">
@@ -412,7 +403,7 @@ extends org.jamon.AbstractTemplateProxy</pre>
<ul class="blockList">
<li class="blockList">
<h4>setBcv</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.166">setBcv</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_bcv)</pre>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.159">setBcv</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_bcv)</pre>
</li>
</ul>
<a name="setBcn(java.lang.String)">
@@ -421,7 +412,16 @@ extends org.jamon.AbstractTemplateProxy</pre>
<ul class="blockList">
<li class="blockList">
<h4>setBcn</h4>
-<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.173">setBcn</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_bcn)</pre>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.166">setBcn</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_bcn)</pre>
+</li>
+</ul>
+<a name="setFormat(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setFormat</h4>
+<pre>public final <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.173">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> p_format)</pre>
</li>
</ul>
<a name="constructImpl(java.lang.Class)">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
index e27531a..4de41cc 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
@@ -224,40 +224,40 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/
<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.28">regionServer</a></pre>
</li>
</ul>
-<a name="format">
+<a name="filter">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>format</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.29">format</a></pre>
+<h4>filter</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.29">filter</a></pre>
</li>
</ul>
-<a name="filter">
+<a name="bcv">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>filter</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.30">filter</a></pre>
+<h4>bcv</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.30">bcv</a></pre>
</li>
</ul>
-<a name="bcv">
+<a name="bcn">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>bcv</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.31">bcv</a></pre>
+<h4>bcn</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.31">bcn</a></pre>
</li>
</ul>
-<a name="bcn">
+<a name="format">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>bcn</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.32">bcn</a></pre>
+<h4>format</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.32">format</a></pre>
</li>
</ul>
</li>