hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [06/18] hbase-site git commit: Published site at 9f8273e7175954cf6dd4bf523b531bf9971749bb.
Date Wed, 17 Feb 2016 17:36:10 GMT
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&lt;HRegionInfo&gt; 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 &gt; 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&lt;HRegionInfo&gt; 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 &gt; 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&lt;Pair&lt;HRegionInfo, ServerName&gt;&gt; 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&lt;HRegionInfo&gt; 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() &lt; 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 &gt; 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 &gt; count);
-<a class="jxr_linenumber" name="263" href="#263">263</a>       List&lt;RegionServerThread&gt; 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() &lt; 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 &lt;= 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 &gt; 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&lt;HRegionInfo&gt; 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>             &amp;&amp; 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>             &amp;&amp; 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&lt;Pair&lt;HRegionInfo, ServerName&gt;&gt; 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&lt;HRegionInfo&gt; 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&lt;Pair&lt;HRegionInfo, ServerName&gt;&gt; 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&lt;HRegionInfo&gt; initialRegions = <strong class="jxr_keyword">new</strong> ArrayList&lt;HRegionInfo&gt;();
-<a class="jxr_linenumber" name="373" href="#373">373</a>     <strong class="jxr_keyword">for</strong> (Pair&lt;HRegionInfo, ServerName&gt; 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&lt;HRegionInfo&gt; currentRegions = <strong class="jxr_keyword">new</strong> ArrayList&lt;HRegionInfo&gt;();
-<a class="jxr_linenumber" name="377" href="#377">377</a>     <strong class="jxr_keyword">for</strong> (Pair&lt;HRegionInfo, ServerName&gt; 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&lt;Pair&lt;HRegionInfo, ServerName&gt;&gt; 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&lt;HRegionInfo&gt; 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() &lt; 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 &gt; 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 &gt; count);
+<a class="jxr_linenumber" name="267" href="#267">267</a>       List&lt;RegionServerThread&gt; 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() &lt; 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 &lt;= 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 &gt; 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&lt;HRegionInfo&gt; 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>             &amp;&amp; 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>             &amp;&amp; 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&lt;Pair&lt;HRegionInfo, ServerName&gt;&gt; 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&lt;HRegionInfo&gt; 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&lt;Pair&lt;HRegionInfo, ServerName&gt;&gt; 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&lt;HRegionInfo&gt; initialRegions = <strong class="jxr_keyword">new</strong> ArrayList&lt;HRegionInfo&gt;();
+<a class="jxr_linenumber" name="377" href="#377">377</a>     <strong class="jxr_keyword">for</strong> (Pair&lt;HRegionInfo, ServerName&gt; 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&lt;HRegionInfo&gt; 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&lt;HRegionInfo&gt; 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>

Mime
View raw message