You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by oh...@apache.org on 2018/12/04 08:27:11 UTC
[35/51] [partial] incubator-omid-site git commit: [wagon-git] commit
to branch asf-site 12/4/18 10:26 AM
http://git-wip-us.apache.org/repos/asf/incubator-omid-site/blob/9ccae1ee/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html b/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html
index b69abfe..59b78be 100644
--- a/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html
+++ b/xref-test/org/apache/omid/transaction/TestEndToEndScenariosWithHA.html
@@ -27,399 +27,400 @@
<a class="jxr_linenumber" name="17" href="#17">17</a> <em class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="18" href="#18">18</a> <strong class="jxr_keyword">package</strong> org.apache.omid.transaction;
<a class="jxr_linenumber" name="19" href="#19">19</a>
-<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> com.google.common.base.Charsets;
-<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> com.google.inject.Guice;
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> com.google.inject.Injector;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.omid.TestUtils;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.LeaseManagement;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.PausableLeaseManager;
-<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TSOServer;
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TSOServerConfig;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.apache.curator.RetryPolicy;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.apache.curator.framework.CuratorFramework;
-<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.apache.curator.framework.CuratorFrameworkFactory;
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.apache.curator.framework.recipes.cache.NodeCache;
-<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.curator.framework.recipes.cache.NodeCacheListener;
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.curator.retry.ExponentialBackoffRetry;
-<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableName;
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
-<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.HBaseAdmin;
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
-<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.AfterMethod;
-<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeMethod;
-<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
-<a class="jxr_linenumber" name="45" href="#45">45</a>
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.CountDownLatch;
-<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.TimeUnit;
-<a class="jxr_linenumber" name="49" href="#49">49</a>
-<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.timestamp.storage.HBaseTimestampStorageConfig.DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME;
-<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.timestamp.storage.HBaseTimestampStorageConfig.DEFAULT_TIMESTAMP_STORAGE_CF_NAME;
-<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.tso.client.OmidClientConfiguration.ConnType.HA;
-<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.HConstants.HBASE_CLIENT_RETRIES_NUMBER;
-<a class="jxr_linenumber" name="54" href="#54">54</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
-<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.fail;
-<a class="jxr_linenumber" name="57" href="#57">57</a>
-<a class="jxr_linenumber" name="58" href="#58">58</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
-<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestEndToEndScenariosWithHA.html">TestEndToEndScenariosWithHA</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</a> {
-<a class="jxr_linenumber" name="60" href="#60">60</a>
-<a class="jxr_linenumber" name="61" href="#61">61</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> TEST_LEASE_PERIOD_MS = 5_000;
-<a class="jxr_linenumber" name="62" href="#62">62</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CURRENT_TSO_PATH = <span class="jxr_string">"/CURRENT_TSO_PATH"</span>;
-<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TSO_LEASE_PATH = <span class="jxr_string">"/TSO_LEASE_PATH"</span>;
-<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String NAMESPACE = <span class="jxr_string">"omid"</span>;
-<a class="jxr_linenumber" name="65" href="#65">65</a>
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestEndToEndScenariosWithHA.<strong class="jxr_keyword">class</strong>);
-<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">static</strong> <strong class="jxr_keyword">final</strong> byte[] qualifier1 = Bytes.toBytes(<span class="jxr_string">"test-q1"</span>);
-<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> byte[] qualifier2 = Bytes.toBytes(<span class="jxr_string">"test-q2l"</span>);
-<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] row1 = Bytes.toBytes(<span class="jxr_string">"row1"</span>);
-<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> byte[] row2 = Bytes.toBytes(<span class="jxr_string">"row2"</span>);
-<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] initialData = Bytes.toBytes(<span class="jxr_string">"testWrite-0"</span>);
-<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data1_q1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1-q1"</span>);
-<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data1_q2 = Bytes.toBytes(<span class="jxr_string">"testWrite-1-q2"</span>);
-<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data2_q1 = Bytes.toBytes(<span class="jxr_string">"testWrite-2-q1"</span>);
-<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data2_q2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2-q2"</span>);
-<a class="jxr_linenumber" name="77" href="#77">77</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> TSO1_PORT = 2223;
-<a class="jxr_linenumber" name="78" href="#78">78</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> TSO2_PORT = 4321;
-<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> CountDownLatch barrierTillTSOAddressPublication;
-<a class="jxr_linenumber" name="81" href="#81">81</a>
-<a class="jxr_linenumber" name="82" href="#82">82</a> <strong class="jxr_keyword">private</strong> CuratorFramework zkClient;
-<a class="jxr_linenumber" name="83" href="#83">83</a>
-<a class="jxr_linenumber" name="84" href="#84">84</a> <strong class="jxr_keyword">private</strong> TSOServer tso1;
-<a class="jxr_linenumber" name="85" href="#85">85</a> <strong class="jxr_keyword">private</strong> TSOServer tso2;
-<a class="jxr_linenumber" name="86" href="#86">86</a>
-<a class="jxr_linenumber" name="87" href="#87">87</a> <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/omid/tso/PausableLeaseManager.html">PausableLeaseManager</a> leaseManager1;
-<a class="jxr_linenumber" name="88" href="#88">88</a>
-<a class="jxr_linenumber" name="89" href="#89">89</a> <strong class="jxr_keyword">private</strong> TransactionManager tm;
-<a class="jxr_linenumber" name="90" href="#90">90</a>
-<a class="jxr_linenumber" name="91" href="#91">91</a> @BeforeMethod(alwaysRun = <strong class="jxr_keyword">true</strong>, timeOut = 30_000)
-<a class="jxr_linenumber" name="92" href="#92">92</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="93" href="#93">93</a> <em class="jxr_comment">// Get the zkConnection string from minicluster</em>
-<a class="jxr_linenumber" name="94" href="#94">94</a> String zkConnection = <span class="jxr_string">"localhost:"</span> + hBaseUtils.getZkCluster().getClientPort();
-<a class="jxr_linenumber" name="95" href="#95">95</a>
-<a class="jxr_linenumber" name="96" href="#96">96</a> zkClient = provideInitializedZookeeperClient(zkConnection);
-<a class="jxr_linenumber" name="97" href="#97">97</a>
-<a class="jxr_linenumber" name="98" href="#98">98</a> <em class="jxr_comment">// Synchronize TSO start</em>
-<a class="jxr_linenumber" name="99" href="#99">99</a> barrierTillTSOAddressPublication = <strong class="jxr_keyword">new</strong> CountDownLatch(1);
-<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">final</strong> NodeCache currentTSOZNode = <strong class="jxr_keyword">new</strong> NodeCache(zkClient, CURRENT_TSO_PATH);
-<a class="jxr_linenumber" name="101" href="#101">101</a> currentTSOZNode.getListenable().addListener(<strong class="jxr_keyword">new</strong> NodeCacheListener() {
-<a class="jxr_linenumber" name="102" href="#102">102</a>
-<a class="jxr_linenumber" name="103" href="#103">103</a> @Override
-<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> nodeChanged() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="105" href="#105">105</a> byte[] currentTSOAndEpochAsBytes = currentTSOZNode.getCurrentData().getData();
-<a class="jxr_linenumber" name="106" href="#106">106</a> String currentTSOAndEpoch = <strong class="jxr_keyword">new</strong> String(currentTSOAndEpochAsBytes, Charsets.UTF_8);
-<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">if</strong> (currentTSOAndEpoch.endsWith(<span class="jxr_string">"#0"</span>)) { <em class="jxr_comment">// Wait till a TSO instance publishes the epoch</em>
-<a class="jxr_linenumber" name="108" href="#108">108</a> barrierTillTSOAddressPublication.countDown();
-<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>
-<a class="jxr_linenumber" name="112" href="#112">112</a> });
-<a class="jxr_linenumber" name="113" href="#113">113</a> currentTSOZNode.start(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="114" href="#114">114</a>
-<a class="jxr_linenumber" name="115" href="#115">115</a> <em class="jxr_comment">// Configure TSO 1</em>
-<a class="jxr_linenumber" name="116" href="#116">116</a> TSOServerConfig config1 = <strong class="jxr_keyword">new</strong> TSOServerConfig();
-<a class="jxr_linenumber" name="117" href="#117">117</a> config1.setPort(TSO1_PORT);
-<a class="jxr_linenumber" name="118" href="#118">118</a> config1.setConflictMapSize(1000);
-<a class="jxr_linenumber" name="119" href="#119">119</a> config1.setLeaseModule(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestHALeaseManagementModule.html">TestHALeaseManagementModule</a>(TEST_LEASE_PERIOD_MS, TSO_LEASE_PATH, CURRENT_TSO_PATH, zkConnection, NAMESPACE));
-<a class="jxr_linenumber" name="120" href="#120">120</a> Injector injector1 = Guice.createInjector(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestTSOModule.html">TestTSOModule</a>(hbaseConf, config1));
-<a class="jxr_linenumber" name="121" href="#121">121</a> LOG.info(<span class="jxr_string">"===================== Starting TSO 1 ====================="</span>);
-<a class="jxr_linenumber" name="122" href="#122">122</a> tso1 = injector1.getInstance(TSOServer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="123" href="#123">123</a> leaseManager1 = (PausableLeaseManager) injector1.getInstance(LeaseManagement.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="124" href="#124">124</a> tso1.startAndWait();
-<a class="jxr_linenumber" name="125" href="#125">125</a> TestUtils.waitForSocketListening(<span class="jxr_string">"localhost"</span>, TSO1_PORT, 100);
-<a class="jxr_linenumber" name="126" href="#126">126</a> LOG.info(<span class="jxr_string">"================ Finished loading TSO 1 =================="</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">// Configure TSO 2</em>
-<a class="jxr_linenumber" name="129" href="#129">129</a> TSOServerConfig config2 = <strong class="jxr_keyword">new</strong> TSOServerConfig();
-<a class="jxr_linenumber" name="130" href="#130">130</a> config2.setPort(TSO2_PORT);
-<a class="jxr_linenumber" name="131" href="#131">131</a> config2.setConflictMapSize(1000);
-<a class="jxr_linenumber" name="132" href="#132">132</a> config2.setLeaseModule(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestHALeaseManagementModule.html">TestHALeaseManagementModule</a>(TEST_LEASE_PERIOD_MS, TSO_LEASE_PATH, CURRENT_TSO_PATH, zkConnection, NAMESPACE));
-<a class="jxr_linenumber" name="133" href="#133">133</a> Injector injector2 = Guice.createInjector(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestTSOModule.html">TestTSOModule</a>(hbaseConf, config2));
-<a class="jxr_linenumber" name="134" href="#134">134</a> LOG.info(<span class="jxr_string">"===================== Starting TSO 2 ====================="</span>);
-<a class="jxr_linenumber" name="135" href="#135">135</a> tso2 = injector2.getInstance(TSOServer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="136" href="#136">136</a> injector2.getInstance(LeaseManagement.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="137" href="#137">137</a> tso2.startAndWait();
-<a class="jxr_linenumber" name="138" href="#138">138</a> <em class="jxr_comment">// Don't do this here: TestUtils.waitForSocketListening("localhost", 4321, 100);</em>
-<a class="jxr_linenumber" name="139" href="#139">139</a> LOG.info(<span class="jxr_string">"================ Finished loading TSO 2 =================="</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">// Wait till the master TSO is up</em>
-<a class="jxr_linenumber" name="142" href="#142">142</a> barrierTillTSOAddressPublication.await();
-<a class="jxr_linenumber" name="143" href="#143">143</a> currentTSOZNode.close();
-<a class="jxr_linenumber" name="144" href="#144">144</a>
-<a class="jxr_linenumber" name="145" href="#145">145</a> <em class="jxr_comment">// Configure HBase TM</em>
-<a class="jxr_linenumber" name="146" href="#146">146</a> LOG.info(<span class="jxr_string">"===================== Starting TM ====================="</span>);
-<a class="jxr_linenumber" name="147" href="#147">147</a> HBaseOmidClientConfiguration hbaseOmidClientConf = <strong class="jxr_keyword">new</strong> HBaseOmidClientConfiguration();
-<a class="jxr_linenumber" name="148" href="#148">148</a> hbaseOmidClientConf.setConnectionType(HA);
-<a class="jxr_linenumber" name="149" href="#149">149</a> hbaseOmidClientConf.setConnectionString(zkConnection);
-<a class="jxr_linenumber" name="150" href="#150">150</a> hbaseOmidClientConf.getOmidClientConfiguration().setZkCurrentTsoPath(CURRENT_TSO_PATH);
-<a class="jxr_linenumber" name="151" href="#151">151</a> hbaseOmidClientConf.getOmidClientConfiguration().setZkNamespace(NAMESPACE);
-<a class="jxr_linenumber" name="152" href="#152">152</a> hbaseOmidClientConf.setHBaseConfiguration(hbaseConf);
-<a class="jxr_linenumber" name="153" href="#153">153</a> hbaseConf.setInt(HBASE_CLIENT_RETRIES_NUMBER, 3);
-<a class="jxr_linenumber" name="154" href="#154">154</a> tm = HBaseTransactionManager.builder(hbaseOmidClientConf).build();
-<a class="jxr_linenumber" name="155" href="#155">155</a> LOG.info(<span class="jxr_string">"===================== TM Started ========================="</span>);
-<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="20" href="#20">20</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.HConstants.HBASE_CLIENT_RETRIES_NUMBER;
+<a class="jxr_linenumber" name="21" href="#21">21</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.timestamp.storage.HBaseTimestampStorageConfig.DEFAULT_TIMESTAMP_STORAGE_CF_NAME;
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.timestamp.storage.HBaseTimestampStorageConfig.DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.omid.tso.client.OmidClientConfiguration.ConnType.HA;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertEquals;
+<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.assertTrue;
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.testng.Assert.fail;
+<a class="jxr_linenumber" name="27" href="#27">27</a>
+<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.CountDownLatch;
+<a class="jxr_linenumber" name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> java.util.concurrent.TimeUnit;
+<a class="jxr_linenumber" name="31" href="#31">31</a>
+<a class="jxr_linenumber" name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.apache.curator.RetryPolicy;
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">import</strong> org.apache.curator.framework.CuratorFramework;
+<a class="jxr_linenumber" name="34" href="#34">34</a> <strong class="jxr_keyword">import</strong> org.apache.curator.framework.CuratorFrameworkFactory;
+<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">import</strong> org.apache.curator.framework.recipes.cache.NodeCache;
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">import</strong> org.apache.curator.framework.recipes.cache.NodeCacheListener;
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">import</strong> org.apache.curator.retry.ExponentialBackoffRetry;
+<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.TableName;
+<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Get;
+<a class="jxr_linenumber" name="40" href="#40">40</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.HBaseAdmin;
+<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Put;
+<a class="jxr_linenumber" name="42" href="#42">42</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.client.Result;
+<a class="jxr_linenumber" name="43" href="#43">43</a> <strong class="jxr_keyword">import</strong> org.apache.hadoop.hbase.util.Bytes;
+<a class="jxr_linenumber" name="44" href="#44">44</a> <strong class="jxr_keyword">import</strong> org.apache.omid.TestUtils;
+<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.LeaseManagement;
+<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.PausableLeaseManager;
+<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TSOServer;
+<a class="jxr_linenumber" name="48" href="#48">48</a> <strong class="jxr_keyword">import</strong> org.apache.omid.tso.TSOServerConfig;
+<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.AfterMethod;
+<a class="jxr_linenumber" name="52" href="#52">52</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.BeforeMethod;
+<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">import</strong> org.testng.annotations.Test;
+<a class="jxr_linenumber" name="54" href="#54">54</a>
+<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">import</strong> com.google.common.base.Charsets;
+<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">import</strong> com.google.inject.Guice;
+<a class="jxr_linenumber" name="57" href="#57">57</a> <strong class="jxr_keyword">import</strong> com.google.inject.Injector;
+<a class="jxr_linenumber" name="58" href="#58">58</a>
+<a class="jxr_linenumber" name="59" href="#59">59</a> @Test(groups = <span class="jxr_string">"sharedHBase"</span>)
+<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/omid/transaction/TestEndToEndScenariosWithHA.html">TestEndToEndScenariosWithHA</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/omid/transaction/OmidTestBase.html">OmidTestBase</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">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> TEST_LEASE_PERIOD_MS = 5_000;
+<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CURRENT_TSO_PATH = <span class="jxr_string">"/CURRENT_TSO_PATH"</span>;
+<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TSO_LEASE_PATH = <span class="jxr_string">"/TSO_LEASE_PATH"</span>;
+<a class="jxr_linenumber" name="65" href="#65">65</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String NAMESPACE = <span class="jxr_string">"omid"</span>;
+<a class="jxr_linenumber" name="66" href="#66">66</a>
+<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(TestEndToEndScenariosWithHA.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="68" href="#68">68</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> byte[] qualifier1 = Bytes.toBytes(<span class="jxr_string">"test-q1"</span>);
+<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] qualifier2 = Bytes.toBytes(<span class="jxr_string">"test-q2l"</span>);
+<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> byte[] row1 = Bytes.toBytes(<span class="jxr_string">"row1"</span>);
+<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] row2 = Bytes.toBytes(<span class="jxr_string">"row2"</span>);
+<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] initialData = Bytes.toBytes(<span class="jxr_string">"testWrite-0"</span>);
+<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data1_q1 = Bytes.toBytes(<span class="jxr_string">"testWrite-1-q1"</span>);
+<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data1_q2 = Bytes.toBytes(<span class="jxr_string">"testWrite-1-q2"</span>);
+<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data2_q1 = Bytes.toBytes(<span class="jxr_string">"testWrite-2-q1"</span>);
+<a class="jxr_linenumber" name="77" href="#77">77</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> byte[] data2_q2 = Bytes.toBytes(<span class="jxr_string">"testWrite-2-q2"</span>);
+<a class="jxr_linenumber" name="78" href="#78">78</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> TSO1_PORT = 2223;
+<a class="jxr_linenumber" name="79" href="#79">79</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> TSO2_PORT = 4321;
+<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> CountDownLatch barrierTillTSOAddressPublication;
+<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> CuratorFramework zkClient;
+<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> TSOServer tso1;
+<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">private</strong> TSOServer tso2;
+<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> <a href="../../../../org/apache/omid/tso/PausableLeaseManager.html">PausableLeaseManager</a> leaseManager1;
+<a class="jxr_linenumber" name="89" href="#89">89</a>
+<a class="jxr_linenumber" name="90" href="#90">90</a> <strong class="jxr_keyword">private</strong> TransactionManager tm;
+<a class="jxr_linenumber" name="91" href="#91">91</a>
+<a class="jxr_linenumber" name="92" href="#92">92</a> @BeforeMethod(alwaysRun = <strong class="jxr_keyword">true</strong>, timeOut = 30_000)
+<a class="jxr_linenumber" name="93" href="#93">93</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="94" href="#94">94</a> <em class="jxr_comment">// Get the zkConnection string from minicluster</em>
+<a class="jxr_linenumber" name="95" href="#95">95</a> String zkConnection = <span class="jxr_string">"localhost:"</span> + hBaseUtils.getZkCluster().getClientPort();
+<a class="jxr_linenumber" name="96" href="#96">96</a>
+<a class="jxr_linenumber" name="97" href="#97">97</a> zkClient = provideInitializedZookeeperClient(zkConnection);
+<a class="jxr_linenumber" name="98" href="#98">98</a>
+<a class="jxr_linenumber" name="99" href="#99">99</a> <em class="jxr_comment">// Synchronize TSO start</em>
+<a class="jxr_linenumber" name="100" href="#100">100</a> barrierTillTSOAddressPublication = <strong class="jxr_keyword">new</strong> CountDownLatch(1);
+<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">final</strong> NodeCache currentTSOZNode = <strong class="jxr_keyword">new</strong> NodeCache(zkClient, CURRENT_TSO_PATH);
+<a class="jxr_linenumber" name="102" href="#102">102</a> currentTSOZNode.getListenable().addListener(<strong class="jxr_keyword">new</strong> NodeCacheListener() {
+<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">public</strong> <strong class="jxr_keyword">void</strong> nodeChanged() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="106" href="#106">106</a> byte[] currentTSOAndEpochAsBytes = currentTSOZNode.getCurrentData().getData();
+<a class="jxr_linenumber" name="107" href="#107">107</a> String currentTSOAndEpoch = <strong class="jxr_keyword">new</strong> String(currentTSOAndEpochAsBytes, Charsets.UTF_8);
+<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">if</strong> (currentTSOAndEpoch.endsWith(<span class="jxr_string">"#0"</span>)) { <em class="jxr_comment">// Wait till a TSO instance publishes the epoch</em>
+<a class="jxr_linenumber" name="109" href="#109">109</a> barrierTillTSOAddressPublication.countDown();
+<a class="jxr_linenumber" name="110" href="#110">110</a> }
+<a class="jxr_linenumber" name="111" href="#111">111</a> }
+<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> currentTSOZNode.start(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="115" href="#115">115</a>
+<a class="jxr_linenumber" name="116" href="#116">116</a> <em class="jxr_comment">// Configure TSO 1</em>
+<a class="jxr_linenumber" name="117" href="#117">117</a> TSOServerConfig config1 = <strong class="jxr_keyword">new</strong> TSOServerConfig();
+<a class="jxr_linenumber" name="118" href="#118">118</a> config1.setPort(TSO1_PORT);
+<a class="jxr_linenumber" name="119" href="#119">119</a> config1.setConflictMapSize(1000);
+<a class="jxr_linenumber" name="120" href="#120">120</a> config1.setLeaseModule(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestHALeaseManagementModule.html">TestHALeaseManagementModule</a>(TEST_LEASE_PERIOD_MS, TSO_LEASE_PATH, CURRENT_TSO_PATH, zkConnection, NAMESPACE));
+<a class="jxr_linenumber" name="121" href="#121">121</a> Injector injector1 = Guice.createInjector(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestTSOModule.html">TestTSOModule</a>(hbaseConf, config1));
+<a class="jxr_linenumber" name="122" href="#122">122</a> LOG.info(<span class="jxr_string">"===================== Starting TSO 1 ====================="</span>);
+<a class="jxr_linenumber" name="123" href="#123">123</a> tso1 = injector1.getInstance(TSOServer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="124" href="#124">124</a> leaseManager1 = (PausableLeaseManager) injector1.getInstance(LeaseManagement.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="125" href="#125">125</a> tso1.startAndWait();
+<a class="jxr_linenumber" name="126" href="#126">126</a> TestUtils.waitForSocketListening(<span class="jxr_string">"localhost"</span>, TSO1_PORT, 100);
+<a class="jxr_linenumber" name="127" href="#127">127</a> LOG.info(<span class="jxr_string">"================ Finished loading TSO 1 =================="</span>);
+<a class="jxr_linenumber" name="128" href="#128">128</a>
+<a class="jxr_linenumber" name="129" href="#129">129</a> <em class="jxr_comment">// Configure TSO 2</em>
+<a class="jxr_linenumber" name="130" href="#130">130</a> TSOServerConfig config2 = <strong class="jxr_keyword">new</strong> TSOServerConfig();
+<a class="jxr_linenumber" name="131" href="#131">131</a> config2.setPort(TSO2_PORT);
+<a class="jxr_linenumber" name="132" href="#132">132</a> config2.setConflictMapSize(1000);
+<a class="jxr_linenumber" name="133" href="#133">133</a> config2.setLeaseModule(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestHALeaseManagementModule.html">TestHALeaseManagementModule</a>(TEST_LEASE_PERIOD_MS, TSO_LEASE_PATH, CURRENT_TSO_PATH, zkConnection, NAMESPACE));
+<a class="jxr_linenumber" name="134" href="#134">134</a> Injector injector2 = Guice.createInjector(<strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/omid/transaction/TestTSOModule.html">TestTSOModule</a>(hbaseConf, config2));
+<a class="jxr_linenumber" name="135" href="#135">135</a> LOG.info(<span class="jxr_string">"===================== Starting TSO 2 ====================="</span>);
+<a class="jxr_linenumber" name="136" href="#136">136</a> tso2 = injector2.getInstance(TSOServer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="137" href="#137">137</a> injector2.getInstance(LeaseManagement.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="138" href="#138">138</a> tso2.startAndWait();
+<a class="jxr_linenumber" name="139" href="#139">139</a> <em class="jxr_comment">// Don't do this here: TestUtils.waitForSocketListening("localhost", 4321, 100);</em>
+<a class="jxr_linenumber" name="140" href="#140">140</a> LOG.info(<span class="jxr_string">"================ Finished loading TSO 2 =================="</span>);
+<a class="jxr_linenumber" name="141" href="#141">141</a>
+<a class="jxr_linenumber" name="142" href="#142">142</a> <em class="jxr_comment">// Wait till the master TSO is up</em>
+<a class="jxr_linenumber" name="143" href="#143">143</a> barrierTillTSOAddressPublication.await();
+<a class="jxr_linenumber" name="144" href="#144">144</a> currentTSOZNode.close();
+<a class="jxr_linenumber" name="145" href="#145">145</a>
+<a class="jxr_linenumber" name="146" href="#146">146</a> <em class="jxr_comment">// Configure HBase TM</em>
+<a class="jxr_linenumber" name="147" href="#147">147</a> LOG.info(<span class="jxr_string">"===================== Starting TM ====================="</span>);
+<a class="jxr_linenumber" name="148" href="#148">148</a> HBaseOmidClientConfiguration hbaseOmidClientConf = <strong class="jxr_keyword">new</strong> HBaseOmidClientConfiguration();
+<a class="jxr_linenumber" name="149" href="#149">149</a> hbaseOmidClientConf.setConnectionType(HA);
+<a class="jxr_linenumber" name="150" href="#150">150</a> hbaseOmidClientConf.setConnectionString(zkConnection);
+<a class="jxr_linenumber" name="151" href="#151">151</a> hbaseOmidClientConf.getOmidClientConfiguration().setZkCurrentTsoPath(CURRENT_TSO_PATH);
+<a class="jxr_linenumber" name="152" href="#152">152</a> hbaseOmidClientConf.getOmidClientConfiguration().setZkNamespace(NAMESPACE);
+<a class="jxr_linenumber" name="153" href="#153">153</a> hbaseOmidClientConf.setHBaseConfiguration(hbaseConf);
+<a class="jxr_linenumber" name="154" href="#154">154</a> hbaseConf.setInt(HBASE_CLIENT_RETRIES_NUMBER, 3);
+<a class="jxr_linenumber" name="155" href="#155">155</a> tm = HBaseTransactionManager.builder(hbaseOmidClientConf).build();
+<a class="jxr_linenumber" name="156" href="#156">156</a> LOG.info(<span class="jxr_string">"===================== TM Started ========================="</span>);
+<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> @AfterMethod(alwaysRun = <strong class="jxr_keyword">true</strong>, timeOut = 60_000)
-<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> cleanup() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="161" href="#161">161</a> LOG.info(<span class="jxr_string">"Cleanup"</span>);
-<a class="jxr_linenumber" name="162" href="#162">162</a> HBaseAdmin admin = hBaseUtils.getHBaseAdmin();
-<a class="jxr_linenumber" name="163" href="#163">163</a> deleteTable(admin, TableName.valueOf(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME));
-<a class="jxr_linenumber" name="164" href="#164">164</a> hBaseUtils.createTable(Bytes.toBytes(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME),
-<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">new</strong> byte[][]{DEFAULT_TIMESTAMP_STORAGE_CF_NAME.getBytes()},
-<a class="jxr_linenumber" name="166" href="#166">166</a> Integer.MAX_VALUE);
-<a class="jxr_linenumber" name="167" href="#167">167</a> tso1.stopAndWait();
-<a class="jxr_linenumber" name="168" href="#168">168</a> TestUtils.waitForSocketNotListening(<span class="jxr_string">"localhost"</span>, TSO1_PORT, 100);
-<a class="jxr_linenumber" name="169" href="#169">169</a> tso2.stopAndWait();
-<a class="jxr_linenumber" name="170" href="#170">170</a> TestUtils.waitForSocketNotListening(<span class="jxr_string">"localhost"</span>, TSO2_PORT, 100);
-<a class="jxr_linenumber" name="171" href="#171">171</a>
-<a class="jxr_linenumber" name="172" href="#172">172</a> zkClient.delete().forPath(TSO_LEASE_PATH);
-<a class="jxr_linenumber" name="173" href="#173">173</a> LOG.info(<span class="jxr_string">"ZKPath {} deleted"</span>, TSO_LEASE_PATH);
-<a class="jxr_linenumber" name="174" href="#174">174</a> zkClient.delete().forPath(CURRENT_TSO_PATH);
-<a class="jxr_linenumber" name="175" href="#175">175</a> LOG.info(<span class="jxr_string">"ZKPaths {} deleted"</span>, CURRENT_TSO_PATH);
-<a class="jxr_linenumber" name="176" href="#176">176</a>
-<a class="jxr_linenumber" name="177" href="#177">177</a> zkClient.close();
-<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> <em class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="181" href="#181">181</a> <em class="jxr_comment">// TSO 1 is MASTER & TSO 2 is BACKUP</em>
-<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_comment">// Setup: TX 0 -> Add initial data to cells R1C1 (v0) & R2C2 (v0)</em>
-<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_comment">// TX 1 starts (TSO1)</em>
-<a class="jxr_linenumber" name="184" href="#184">184</a> <em class="jxr_comment">// TX 1 modifies cells R1C1 & R2C2 (v1)</em>
-<a class="jxr_linenumber" name="185" href="#185">185</a> <em class="jxr_comment">// Interleaved Read TX -IR TX- starts (TSO1)</em>
-<a class="jxr_linenumber" name="186" href="#186">186</a> <em class="jxr_comment">// TSO 1 PAUSES -> TSO 2 becomes MASTER</em>
-<a class="jxr_linenumber" name="187" href="#187">187</a> <em class="jxr_comment">// IR TX reads R1C1 -> should get v0</em>
-<a class="jxr_linenumber" name="188" href="#188">188</a> <em class="jxr_comment">// TX 1 tries to commit -> should abort because was started in TSO 1</em>
-<a class="jxr_linenumber" name="189" href="#189">189</a> <em class="jxr_comment">// IR TX reads R2C2 -> should get v0</em>
-<a class="jxr_linenumber" name="190" href="#190">190</a> <em class="jxr_comment">// IR TX tries to commit -> should abort because was started in TSO 1</em>
-<a class="jxr_linenumber" name="191" href="#191">191</a> <em class="jxr_comment">// End of Test state: R1C1 & R2C2 (v0)</em>
-<a class="jxr_linenumber" name="192" href="#192">192</a> @Test(timeOut = 60_000)
-<a class="jxr_linenumber" name="193" href="#193">193</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScenario1() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="194" href="#194">194</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="195" href="#195">195</a>
-<a class="jxr_linenumber" name="196" href="#196">196</a> <em class="jxr_comment">// Write initial values for the test</em>
-<a class="jxr_linenumber" name="197" href="#197">197</a> HBaseTransaction tx0 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="198" href="#198">198</a> <strong class="jxr_keyword">long</strong> initialEpoch = tx0.getEpoch();
-<a class="jxr_linenumber" name="199" href="#199">199</a> LOG.info(<span class="jxr_string">"Starting Tx {} writing initial values for cells ({}) "</span>, tx0, Bytes.toString(initialData));
-<a class="jxr_linenumber" name="200" href="#200">200</a> Put putInitialDataRow1 = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="201" href="#201">201</a> putInitialDataRow1.add(TEST_FAMILY.getBytes(), qualifier1, initialData);
-<a class="jxr_linenumber" name="202" href="#202">202</a> txTable.put(tx0, putInitialDataRow1);
-<a class="jxr_linenumber" name="203" href="#203">203</a> Put putInitialDataRow2 = <strong class="jxr_keyword">new</strong> Put(row2);
-<a class="jxr_linenumber" name="204" href="#204">204</a> putInitialDataRow2.add(TEST_FAMILY.getBytes(), qualifier2, initialData);
-<a class="jxr_linenumber" name="205" href="#205">205</a> txTable.put(tx0, putInitialDataRow2);
-<a class="jxr_linenumber" name="206" href="#206">206</a> tm.commit(tx0);
-<a class="jxr_linenumber" name="207" href="#207">207</a>
-<a class="jxr_linenumber" name="208" href="#208">208</a> <em class="jxr_comment">// Initial checks</em>
-<a class="jxr_linenumber" name="209" href="#209">209</a> checkRowValues(txTable, initialData, initialData);
-<a class="jxr_linenumber" name="210" href="#210">210</a>
-<a class="jxr_linenumber" name="211" href="#211">211</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="212" href="#212">212</a> LOG.info(<span class="jxr_string">"Starting Tx {} writing values for cells ({}, {}) "</span>, tx1, Bytes.toString(data1_q1),
-<a class="jxr_linenumber" name="213" href="#213">213</a> Bytes.toString(data1_q2));
-<a class="jxr_linenumber" name="214" href="#214">214</a> Put putData1R1Q1 = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="215" href="#215">215</a> putData1R1Q1.add(TEST_FAMILY.getBytes(), qualifier1, data1_q1);
-<a class="jxr_linenumber" name="216" href="#216">216</a> txTable.put(tx1, putData1R1Q1);
-<a class="jxr_linenumber" name="217" href="#217">217</a> Put putData1R2Q2 = <strong class="jxr_keyword">new</strong> Put(row2);
-<a class="jxr_linenumber" name="218" href="#218">218</a> putData1R2Q2.add(TEST_FAMILY.getBytes(), qualifier2, data1_q2);
-<a class="jxr_linenumber" name="219" href="#219">219</a> txTable.put(tx1, putData1R2Q2);
-<a class="jxr_linenumber" name="220" href="#220">220</a>
-<a class="jxr_linenumber" name="221" href="#221">221</a> Transaction interleavedReadTx = tm.begin();
-<a class="jxr_linenumber" name="222" href="#222">222</a>
-<a class="jxr_linenumber" name="223" href="#223">223</a> LOG.info(<span class="jxr_string">"Starting Interleaving Read Tx {} for checking cell values"</span>, interleavedReadTx.getTransactionId());
-<a class="jxr_linenumber" name="224" href="#224">224</a>
-<a class="jxr_linenumber" name="225" href="#225">225</a> <em class="jxr_comment">// Simulate a GC pause to change mastership (should throw a ServiceUnavailable exception)</em>
-<a class="jxr_linenumber" name="226" href="#226">226</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++++++++++++++++++++++++++++++++++++"</span>);
+<a class="jxr_linenumber" name="159" href="#159">159</a>
+<a class="jxr_linenumber" name="160" href="#160">160</a> @AfterMethod(alwaysRun = <strong class="jxr_keyword">true</strong>, timeOut = 60_000)
+<a class="jxr_linenumber" name="161" href="#161">161</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> cleanup() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="162" href="#162">162</a> LOG.info(<span class="jxr_string">"Cleanup"</span>);
+<a class="jxr_linenumber" name="163" href="#163">163</a> HBaseAdmin admin = hBaseUtils.getHBaseAdmin();
+<a class="jxr_linenumber" name="164" href="#164">164</a> deleteTable(admin, TableName.valueOf(DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME));
+<a class="jxr_linenumber" name="165" href="#165">165</a> hBaseUtils.createTable(TableName.valueOf((DEFAULT_TIMESTAMP_STORAGE_TABLE_NAME)),
+<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">new</strong> byte[][]{DEFAULT_TIMESTAMP_STORAGE_CF_NAME.getBytes()},
+<a class="jxr_linenumber" name="167" href="#167">167</a> Integer.MAX_VALUE);
+<a class="jxr_linenumber" name="168" href="#168">168</a> tso1.stopAndWait();
+<a class="jxr_linenumber" name="169" href="#169">169</a> TestUtils.waitForSocketNotListening(<span class="jxr_string">"localhost"</span>, TSO1_PORT, 100);
+<a class="jxr_linenumber" name="170" href="#170">170</a> tso2.stopAndWait();
+<a class="jxr_linenumber" name="171" href="#171">171</a> TestUtils.waitForSocketNotListening(<span class="jxr_string">"localhost"</span>, TSO2_PORT, 100);
+<a class="jxr_linenumber" name="172" href="#172">172</a>
+<a class="jxr_linenumber" name="173" href="#173">173</a> zkClient.delete().forPath(TSO_LEASE_PATH);
+<a class="jxr_linenumber" name="174" href="#174">174</a> LOG.info(<span class="jxr_string">"ZKPath {} deleted"</span>, TSO_LEASE_PATH);
+<a class="jxr_linenumber" name="175" href="#175">175</a> zkClient.delete().forPath(CURRENT_TSO_PATH);
+<a class="jxr_linenumber" name="176" href="#176">176</a> LOG.info(<span class="jxr_string">"ZKPaths {} deleted"</span>, CURRENT_TSO_PATH);
+<a class="jxr_linenumber" name="177" href="#177">177</a>
+<a class="jxr_linenumber" name="178" href="#178">178</a> zkClient.close();
+<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> <em class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="182" href="#182">182</a> <em class="jxr_comment">// TSO 1 is MASTER & TSO 2 is BACKUP</em>
+<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_comment">// Setup: TX 0 -> Add initial data to cells R1C1 (v0) & R2C2 (v0)</em>
+<a class="jxr_linenumber" name="184" href="#184">184</a> <em class="jxr_comment">// TX 1 starts (TSO1)</em>
+<a class="jxr_linenumber" name="185" href="#185">185</a> <em class="jxr_comment">// TX 1 modifies cells R1C1 & R2C2 (v1)</em>
+<a class="jxr_linenumber" name="186" href="#186">186</a> <em class="jxr_comment">// Interleaved Read TX -IR TX- starts (TSO1)</em>
+<a class="jxr_linenumber" name="187" href="#187">187</a> <em class="jxr_comment">// TSO 1 PAUSES -> TSO 2 becomes MASTER</em>
+<a class="jxr_linenumber" name="188" href="#188">188</a> <em class="jxr_comment">// IR TX reads R1C1 -> should get v0</em>
+<a class="jxr_linenumber" name="189" href="#189">189</a> <em class="jxr_comment">// TX 1 tries to commit -> should abort because was started in TSO 1</em>
+<a class="jxr_linenumber" name="190" href="#190">190</a> <em class="jxr_comment">// IR TX reads R2C2 -> should get v0</em>
+<a class="jxr_linenumber" name="191" href="#191">191</a> <em class="jxr_comment">// IR TX tries to commit -> should abort because was started in TSO 1</em>
+<a class="jxr_linenumber" name="192" href="#192">192</a> <em class="jxr_comment">// End of Test state: R1C1 & R2C2 (v0)</em>
+<a class="jxr_linenumber" name="193" href="#193">193</a> @Test(timeOut = 60_000)
+<a class="jxr_linenumber" name="194" href="#194">194</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScenario1() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="195" href="#195">195</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE)) {
+<a class="jxr_linenumber" name="196" href="#196">196</a>
+<a class="jxr_linenumber" name="197" href="#197">197</a> <em class="jxr_comment">// Write initial values for the test</em>
+<a class="jxr_linenumber" name="198" href="#198">198</a> HBaseTransaction tx0 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="199" href="#199">199</a> <strong class="jxr_keyword">long</strong> initialEpoch = tx0.getEpoch();
+<a class="jxr_linenumber" name="200" href="#200">200</a> LOG.info(<span class="jxr_string">"Starting Tx {} writing initial values for cells ({}) "</span>, tx0, Bytes.toString(initialData));
+<a class="jxr_linenumber" name="201" href="#201">201</a> Put putInitialDataRow1 = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="202" href="#202">202</a> putInitialDataRow1.addColumn(TEST_FAMILY.getBytes(), qualifier1, initialData);
+<a class="jxr_linenumber" name="203" href="#203">203</a> txTable.put(tx0, putInitialDataRow1);
+<a class="jxr_linenumber" name="204" href="#204">204</a> Put putInitialDataRow2 = <strong class="jxr_keyword">new</strong> Put(row2);
+<a class="jxr_linenumber" name="205" href="#205">205</a> putInitialDataRow2.addColumn(TEST_FAMILY.getBytes(), qualifier2, initialData);
+<a class="jxr_linenumber" name="206" href="#206">206</a> txTable.put(tx0, putInitialDataRow2);
+<a class="jxr_linenumber" name="207" href="#207">207</a> tm.commit(tx0);
+<a class="jxr_linenumber" name="208" href="#208">208</a>
+<a class="jxr_linenumber" name="209" href="#209">209</a> <em class="jxr_comment">// Initial checks</em>
+<a class="jxr_linenumber" name="210" href="#210">210</a> checkRowValues(txTable, initialData, initialData);
+<a class="jxr_linenumber" name="211" href="#211">211</a>
+<a class="jxr_linenumber" name="212" href="#212">212</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="213" href="#213">213</a> LOG.info(<span class="jxr_string">"Starting Tx {} writing values for cells ({}, {}) "</span>, tx1, Bytes.toString(data1_q1),
+<a class="jxr_linenumber" name="214" href="#214">214</a> Bytes.toString(data1_q2));
+<a class="jxr_linenumber" name="215" href="#215">215</a> Put putData1R1Q1 = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="216" href="#216">216</a> putData1R1Q1.addColumn(TEST_FAMILY.getBytes(), qualifier1, data1_q1);
+<a class="jxr_linenumber" name="217" href="#217">217</a> txTable.put(tx1, putData1R1Q1);
+<a class="jxr_linenumber" name="218" href="#218">218</a> Put putData1R2Q2 = <strong class="jxr_keyword">new</strong> Put(row2);
+<a class="jxr_linenumber" name="219" href="#219">219</a> putData1R2Q2.addColumn(TEST_FAMILY.getBytes(), qualifier2, data1_q2);
+<a class="jxr_linenumber" name="220" href="#220">220</a> txTable.put(tx1, putData1R2Q2);
+<a class="jxr_linenumber" name="221" href="#221">221</a>
+<a class="jxr_linenumber" name="222" href="#222">222</a> Transaction interleavedReadTx = tm.begin();
+<a class="jxr_linenumber" name="223" href="#223">223</a>
+<a class="jxr_linenumber" name="224" href="#224">224</a> LOG.info(<span class="jxr_string">"Starting Interleaving Read Tx {} for checking cell values"</span>, interleavedReadTx.getTransactionId());
+<a class="jxr_linenumber" name="225" href="#225">225</a>
+<a class="jxr_linenumber" name="226" href="#226">226</a> <em class="jxr_comment">// Simulate a GC pause to change mastership (should throw a ServiceUnavailable exception)</em>
<a class="jxr_linenumber" name="227" href="#227">227</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++++++++++++++++++++++++++++++++++++"</span>);
-<a class="jxr_linenumber" name="228" href="#228">228</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++ PAUSING TSO 1 +++++++++++++++++++"</span>);
-<a class="jxr_linenumber" name="229" href="#229">229</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++++++++++++++++++++++++++++++++++++"</span>);
+<a class="jxr_linenumber" name="228" href="#228">228</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++++++++++++++++++++++++++++++++++++"</span>);
+<a class="jxr_linenumber" name="229" href="#229">229</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++ PAUSING TSO 1 +++++++++++++++++++"</span>);
<a class="jxr_linenumber" name="230" href="#230">230</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++++++++++++++++++++++++++++++++++++"</span>);
-<a class="jxr_linenumber" name="231" href="#231">231</a> leaseManager1.pausedInStillInLeasePeriod();
-<a class="jxr_linenumber" name="232" href="#232">232</a>
-<a class="jxr_linenumber" name="233" href="#233">233</a> <em class="jxr_comment">// Read interleaved and check the values writen by tx 1</em>
-<a class="jxr_linenumber" name="234" href="#234">234</a> Get getRow1 = <strong class="jxr_keyword">new</strong> Get(row1).setMaxVersions(1);
-<a class="jxr_linenumber" name="235" href="#235">235</a> getRow1.addColumn(TEST_FAMILY.getBytes(), qualifier1);
-<a class="jxr_linenumber" name="236" href="#236">236</a> Result r = txTable.get(interleavedReadTx, getRow1);
-<a class="jxr_linenumber" name="237" href="#237">237</a> assertEquals(r.getValue(TEST_FAMILY.getBytes(), qualifier1), initialData,
-<a class="jxr_linenumber" name="238" href="#238">238</a> <span class="jxr_string">"Unexpected value for SI read R1Q1"</span> + interleavedReadTx + <span class="jxr_string">": "</span>
-<a class="jxr_linenumber" name="239" href="#239">239</a> + Bytes.toString(r.getValue(TEST_FAMILY.getBytes(), qualifier1)));
-<a class="jxr_linenumber" name="240" href="#240">240</a>
-<a class="jxr_linenumber" name="241" href="#241">241</a> <em class="jxr_comment">// Try to commit, but it should abort due to the change in mastership</em>
-<a class="jxr_linenumber" name="242" href="#242">242</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="243" href="#243">243</a> tm.commit(tx1);
-<a class="jxr_linenumber" name="244" href="#244">244</a> fail();
-<a class="jxr_linenumber" name="245" href="#245">245</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
-<a class="jxr_linenumber" name="246" href="#246">246</a> <em class="jxr_comment">// Expected</em>
-<a class="jxr_linenumber" name="247" href="#247">247</a> LOG.info(<span class="jxr_string">"Rollback cause for Tx {}: "</span>, tx1, e.getCause());
-<a class="jxr_linenumber" name="248" href="#248">248</a> assertEquals(tx1.getStatus(), Transaction.Status.ROLLEDBACK);
-<a class="jxr_linenumber" name="249" href="#249">249</a> assertEquals(tx1.getEpoch(), initialEpoch);
-<a class="jxr_linenumber" name="250" href="#250">250</a> }
-<a class="jxr_linenumber" name="251" href="#251">251</a>
-<a class="jxr_linenumber" name="252" href="#252">252</a> <em class="jxr_comment">// Read interleaved and check the values written by tx 1</em>
-<a class="jxr_linenumber" name="253" href="#253">253</a> Get getRow2 = <strong class="jxr_keyword">new</strong> Get(row2).setMaxVersions(1);
-<a class="jxr_linenumber" name="254" href="#254">254</a> r = txTable.get(interleavedReadTx, getRow2);
-<a class="jxr_linenumber" name="255" href="#255">255</a> assertEquals(r.getValue(TEST_FAMILY.getBytes(), qualifier2), initialData,
-<a class="jxr_linenumber" name="256" href="#256">256</a> <span class="jxr_string">"Unexpected value for SI read R2Q2"</span> + interleavedReadTx + <span class="jxr_string">": "</span>
-<a class="jxr_linenumber" name="257" href="#257">257</a> + Bytes.toString(r.getValue(TEST_FAMILY.getBytes(), qualifier2)));
-<a class="jxr_linenumber" name="258" href="#258">258</a>
-<a class="jxr_linenumber" name="259" href="#259">259</a> <em class="jxr_comment">// Should commit because its a read only tx does not have to contact the TSO</em>
-<a class="jxr_linenumber" name="260" href="#260">260</a> tm.commit(interleavedReadTx);
-<a class="jxr_linenumber" name="261" href="#261">261</a> assertEquals(interleavedReadTx.getEpoch(), initialEpoch);
-<a class="jxr_linenumber" name="262" href="#262">262</a> assertEquals(interleavedReadTx.getStatus(), Transaction.Status.COMMITTED_RO);
-<a class="jxr_linenumber" name="263" href="#263">263</a>
-<a class="jxr_linenumber" name="264" href="#264">264</a> LOG.info(<span class="jxr_string">"Wait till the client is informed about the connection parameters of the new TSO"</span>);
-<a class="jxr_linenumber" name="265" href="#265">265</a> TestUtils.waitForSocketListening(<span class="jxr_string">"localhost"</span>, TSO2_PORT, 100);
-<a class="jxr_linenumber" name="266" href="#266">266</a>
-<a class="jxr_linenumber" name="267" href="#267">267</a> checkRowValues(txTable, initialData, initialData);
-<a class="jxr_linenumber" name="268" href="#268">268</a>
-<a class="jxr_linenumber" name="269" href="#269">269</a> <em class="jxr_comment">// Need to resume to let other test progress</em>
-<a class="jxr_linenumber" name="270" href="#270">270</a> leaseManager1.resume();
-<a class="jxr_linenumber" name="271" href="#271">271</a>
-<a class="jxr_linenumber" name="272" href="#272">272</a> }
-<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>
-<a class="jxr_linenumber" name="276" href="#276">276</a> <em class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="277" href="#277">277</a> <em class="jxr_comment">// TSO 1 is MASTER & TSO 2 is BACKUP</em>
-<a class="jxr_linenumber" name="278" href="#278">278</a> <em class="jxr_comment">// Setup: TX 0 -> Add initial data to cells R1C1 (v0) & R2C2 (v0)</em>
-<a class="jxr_linenumber" name="279" href="#279">279</a> <em class="jxr_comment">// TX 1 starts (TSO1)</em>
-<a class="jxr_linenumber" name="280" href="#280">280</a> <em class="jxr_comment">// TX 1 modifies cells R1C1 & R2C2 (v1)</em>
-<a class="jxr_linenumber" name="281" href="#281">281</a> <em class="jxr_comment">// TSO 1 is KILLED -> TSO 2 becomes MASTER</em>
-<a class="jxr_linenumber" name="282" href="#282">282</a> <em class="jxr_comment">// TX 1 tries to commit -> should abort because was started in TSO 1</em>
-<a class="jxr_linenumber" name="283" href="#283">283</a> <em class="jxr_comment">// TX 2 starts (TSO1)</em>
-<a class="jxr_linenumber" name="284" href="#284">284</a> <em class="jxr_comment">// TX 2 reads R1C1 -> should get v0</em>
-<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_comment">// TX 2 reads R2C2 -> should get v0</em>
-<a class="jxr_linenumber" name="286" href="#286">286</a> <em class="jxr_comment">// TX 2 modifies cells R1C1 & R2C2 (v2)</em>
-<a class="jxr_linenumber" name="287" href="#287">287</a> <em class="jxr_comment">// TX 2 commits</em>
-<a class="jxr_linenumber" name="288" href="#288">288</a> <em class="jxr_comment">// End of Test state: R1C1 & R2C2 (v2)</em>
-<a class="jxr_linenumber" name="289" href="#289">289</a> @Test(timeOut = 60_000)
-<a class="jxr_linenumber" name="290" href="#290">290</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScenario2() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="291" href="#291">291</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(hbaseConf, TEST_TABLE)) {
-<a class="jxr_linenumber" name="292" href="#292">292</a>
-<a class="jxr_linenumber" name="293" href="#293">293</a> <em class="jxr_comment">// Write initial values for the test</em>
-<a class="jxr_linenumber" name="294" href="#294">294</a> HBaseTransaction tx0 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="295" href="#295">295</a> <strong class="jxr_keyword">long</strong> initialEpoch = tx0.getEpoch();
-<a class="jxr_linenumber" name="296" href="#296">296</a> LOG.info(<span class="jxr_string">"Starting Tx {} writing initial values for cells ({}) "</span>, tx0, Bytes.toString(initialData));
-<a class="jxr_linenumber" name="297" href="#297">297</a> Put putInitialDataRow1 = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="298" href="#298">298</a> putInitialDataRow1.add(TEST_FAMILY.getBytes(), qualifier1, initialData);
-<a class="jxr_linenumber" name="299" href="#299">299</a> txTable.put(tx0, putInitialDataRow1);
-<a class="jxr_linenumber" name="300" href="#300">300</a> Put putInitialDataRow2 = <strong class="jxr_keyword">new</strong> Put(row2);
-<a class="jxr_linenumber" name="301" href="#301">301</a> putInitialDataRow2.add(TEST_FAMILY.getBytes(), qualifier2, initialData);
-<a class="jxr_linenumber" name="302" href="#302">302</a> txTable.put(tx0, putInitialDataRow2);
-<a class="jxr_linenumber" name="303" href="#303">303</a> tm.commit(tx0);
-<a class="jxr_linenumber" name="304" href="#304">304</a>
-<a class="jxr_linenumber" name="305" href="#305">305</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="306" href="#306">306</a> LOG.info(<span class="jxr_string">"Starting Tx {} writing values for cells ({}, {}) "</span>, tx1, Bytes.toString(data1_q1),
-<a class="jxr_linenumber" name="307" href="#307">307</a> Bytes.toString(data1_q2));
-<a class="jxr_linenumber" name="308" href="#308">308</a> Put putData1R1Q1 = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="309" href="#309">309</a> putData1R1Q1.add(TEST_FAMILY.getBytes(), qualifier1, data1_q1);
-<a class="jxr_linenumber" name="310" href="#310">310</a> txTable.put(tx1, putData1R1Q1);
-<a class="jxr_linenumber" name="311" href="#311">311</a> Put putData1R2Q2 = <strong class="jxr_keyword">new</strong> Put(row2);
-<a class="jxr_linenumber" name="312" href="#312">312</a> putData1R2Q2.add(TEST_FAMILY.getBytes(), qualifier2, data1_q2);
-<a class="jxr_linenumber" name="313" href="#313">313</a> txTable.put(tx1, putData1R2Q2);
-<a class="jxr_linenumber" name="314" href="#314">314</a>
-<a class="jxr_linenumber" name="315" href="#315">315</a> <em class="jxr_comment">// Provoke change in mastership (should throw a Connection exception)</em>
-<a class="jxr_linenumber" name="316" href="#316">316</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++++++++++++++++++++++++++++++++++++"</span>);
+<a class="jxr_linenumber" name="231" href="#231">231</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++++++++++++++++++++++++++++++++++++"</span>);
+<a class="jxr_linenumber" name="232" href="#232">232</a> leaseManager1.pausedInStillInLeasePeriod();
+<a class="jxr_linenumber" name="233" href="#233">233</a>
+<a class="jxr_linenumber" name="234" href="#234">234</a> <em class="jxr_comment">// Read interleaved and check the values writen by tx 1</em>
+<a class="jxr_linenumber" name="235" href="#235">235</a> Get getRow1 = <strong class="jxr_keyword">new</strong> Get(row1).setMaxVersions(1);
+<a class="jxr_linenumber" name="236" href="#236">236</a> getRow1.addColumn(TEST_FAMILY.getBytes(), qualifier1);
+<a class="jxr_linenumber" name="237" href="#237">237</a> Result r = txTable.get(interleavedReadTx, getRow1);
+<a class="jxr_linenumber" name="238" href="#238">238</a> assertEquals(r.getValue(TEST_FAMILY.getBytes(), qualifier1), initialData,
+<a class="jxr_linenumber" name="239" href="#239">239</a> <span class="jxr_string">"Unexpected value for SI read R1Q1"</span> + interleavedReadTx + <span class="jxr_string">": "</span>
+<a class="jxr_linenumber" name="240" href="#240">240</a> + Bytes.toString(r.getValue(TEST_FAMILY.getBytes(), qualifier1)));
+<a class="jxr_linenumber" name="241" href="#241">241</a>
+<a class="jxr_linenumber" name="242" href="#242">242</a> <em class="jxr_comment">// Try to commit, but it should abort due to the change in mastership</em>
+<a class="jxr_linenumber" name="243" href="#243">243</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="244" href="#244">244</a> tm.commit(tx1);
+<a class="jxr_linenumber" name="245" href="#245">245</a> fail();
+<a class="jxr_linenumber" name="246" href="#246">246</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
+<a class="jxr_linenumber" name="247" href="#247">247</a> <em class="jxr_comment">// Expected</em>
+<a class="jxr_linenumber" name="248" href="#248">248</a> LOG.info(<span class="jxr_string">"Rollback cause for Tx {}: "</span>, tx1, e.getCause());
+<a class="jxr_linenumber" name="249" href="#249">249</a> assertEquals(tx1.getStatus(), Transaction.Status.ROLLEDBACK);
+<a class="jxr_linenumber" name="250" href="#250">250</a> assertEquals(tx1.getEpoch(), initialEpoch);
+<a class="jxr_linenumber" name="251" href="#251">251</a> }
+<a class="jxr_linenumber" name="252" href="#252">252</a>
+<a class="jxr_linenumber" name="253" href="#253">253</a> <em class="jxr_comment">// Read interleaved and check the values written by tx 1</em>
+<a class="jxr_linenumber" name="254" href="#254">254</a> Get getRow2 = <strong class="jxr_keyword">new</strong> Get(row2).setMaxVersions(1);
+<a class="jxr_linenumber" name="255" href="#255">255</a> r = txTable.get(interleavedReadTx, getRow2);
+<a class="jxr_linenumber" name="256" href="#256">256</a> assertEquals(r.getValue(TEST_FAMILY.getBytes(), qualifier2), initialData,
+<a class="jxr_linenumber" name="257" href="#257">257</a> <span class="jxr_string">"Unexpected value for SI read R2Q2"</span> + interleavedReadTx + <span class="jxr_string">": "</span>
+<a class="jxr_linenumber" name="258" href="#258">258</a> + Bytes.toString(r.getValue(TEST_FAMILY.getBytes(), qualifier2)));
+<a class="jxr_linenumber" name="259" href="#259">259</a>
+<a class="jxr_linenumber" name="260" href="#260">260</a> <em class="jxr_comment">// Should commit because its a read only tx does not have to contact the TSO</em>
+<a class="jxr_linenumber" name="261" href="#261">261</a> tm.commit(interleavedReadTx);
+<a class="jxr_linenumber" name="262" href="#262">262</a> assertEquals(interleavedReadTx.getEpoch(), initialEpoch);
+<a class="jxr_linenumber" name="263" href="#263">263</a> assertEquals(interleavedReadTx.getStatus(), Transaction.Status.COMMITTED_RO);
+<a class="jxr_linenumber" name="264" href="#264">264</a>
+<a class="jxr_linenumber" name="265" href="#265">265</a> LOG.info(<span class="jxr_string">"Wait till the client is informed about the connection parameters of the new TSO"</span>);
+<a class="jxr_linenumber" name="266" href="#266">266</a> TestUtils.waitForSocketListening(<span class="jxr_string">"localhost"</span>, TSO2_PORT, 100);
+<a class="jxr_linenumber" name="267" href="#267">267</a>
+<a class="jxr_linenumber" name="268" href="#268">268</a> checkRowValues(txTable, initialData, initialData);
+<a class="jxr_linenumber" name="269" href="#269">269</a>
+<a class="jxr_linenumber" name="270" href="#270">270</a> <em class="jxr_comment">// Need to resume to let other test progress</em>
+<a class="jxr_linenumber" name="271" href="#271">271</a> leaseManager1.resume();
+<a class="jxr_linenumber" name="272" href="#272">272</a>
+<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> }
+<a class="jxr_linenumber" name="276" href="#276">276</a>
+<a class="jxr_linenumber" name="277" href="#277">277</a> <em class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="278" href="#278">278</a> <em class="jxr_comment">// TSO 1 is MASTER & TSO 2 is BACKUP</em>
+<a class="jxr_linenumber" name="279" href="#279">279</a> <em class="jxr_comment">// Setup: TX 0 -> Add initial data to cells R1C1 (v0) & R2C2 (v0)</em>
+<a class="jxr_linenumber" name="280" href="#280">280</a> <em class="jxr_comment">// TX 1 starts (TSO1)</em>
+<a class="jxr_linenumber" name="281" href="#281">281</a> <em class="jxr_comment">// TX 1 modifies cells R1C1 & R2C2 (v1)</em>
+<a class="jxr_linenumber" name="282" href="#282">282</a> <em class="jxr_comment">// TSO 1 is KILLED -> TSO 2 becomes MASTER</em>
+<a class="jxr_linenumber" name="283" href="#283">283</a> <em class="jxr_comment">// TX 1 tries to commit -> should abort because was started in TSO 1</em>
+<a class="jxr_linenumber" name="284" href="#284">284</a> <em class="jxr_comment">// TX 2 starts (TSO1)</em>
+<a class="jxr_linenumber" name="285" href="#285">285</a> <em class="jxr_comment">// TX 2 reads R1C1 -> should get v0</em>
+<a class="jxr_linenumber" name="286" href="#286">286</a> <em class="jxr_comment">// TX 2 reads R2C2 -> should get v0</em>
+<a class="jxr_linenumber" name="287" href="#287">287</a> <em class="jxr_comment">// TX 2 modifies cells R1C1 & R2C2 (v2)</em>
+<a class="jxr_linenumber" name="288" href="#288">288</a> <em class="jxr_comment">// TX 2 commits</em>
+<a class="jxr_linenumber" name="289" href="#289">289</a> <em class="jxr_comment">// End of Test state: R1C1 & R2C2 (v2)</em>
+<a class="jxr_linenumber" name="290" href="#290">290</a> @Test(timeOut = 60_000)
+<a class="jxr_linenumber" name="291" href="#291">291</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testScenario2() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="292" href="#292">292</a> <strong class="jxr_keyword">try</strong> (TTable txTable = <strong class="jxr_keyword">new</strong> TTable(connection, TEST_TABLE)) {
+<a class="jxr_linenumber" name="293" href="#293">293</a>
+<a class="jxr_linenumber" name="294" href="#294">294</a> <em class="jxr_comment">// Write initial values for the test</em>
+<a class="jxr_linenumber" name="295" href="#295">295</a> HBaseTransaction tx0 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="296" href="#296">296</a> <strong class="jxr_keyword">long</strong> initialEpoch = tx0.getEpoch();
+<a class="jxr_linenumber" name="297" href="#297">297</a> LOG.info(<span class="jxr_string">"Starting Tx {} writing initial values for cells ({}) "</span>, tx0, Bytes.toString(initialData));
+<a class="jxr_linenumber" name="298" href="#298">298</a> Put putInitialDataRow1 = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="299" href="#299">299</a> putInitialDataRow1.addColumn(TEST_FAMILY.getBytes(), qualifier1, initialData);
+<a class="jxr_linenumber" name="300" href="#300">300</a> txTable.put(tx0, putInitialDataRow1);
+<a class="jxr_linenumber" name="301" href="#301">301</a> Put putInitialDataRow2 = <strong class="jxr_keyword">new</strong> Put(row2);
+<a class="jxr_linenumber" name="302" href="#302">302</a> putInitialDataRow2.addColumn(TEST_FAMILY.getBytes(), qualifier2, initialData);
+<a class="jxr_linenumber" name="303" href="#303">303</a> txTable.put(tx0, putInitialDataRow2);
+<a class="jxr_linenumber" name="304" href="#304">304</a> tm.commit(tx0);
+<a class="jxr_linenumber" name="305" href="#305">305</a>
+<a class="jxr_linenumber" name="306" href="#306">306</a> HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
+<a class="jxr_linenumber" name="307" href="#307">307</a> LOG.info(<span class="jxr_string">"Starting Tx {} writing values for cells ({}, {}) "</span>, tx1, Bytes.toString(data1_q1),
+<a class="jxr_linenumber" name="308" href="#308">308</a> Bytes.toString(data1_q2));
+<a class="jxr_linenumber" name="309" href="#309">309</a> Put putData1R1Q1 = <strong class="jxr_keyword">new</strong> Put(row1);
+<a class="jxr_linenumber" name="310" href="#310">310</a> putData1R1Q1.addColumn(TEST_FAMILY.getBytes(), qualifier1, data1_q1);
+<a class="jxr_linenumber" name="311" href="#311">311</a> txTable.put(tx1, putData1R1Q1);
+<a class="jxr_linenumber" name="312" href="#312">312</a> Put putData1R2Q2 = <strong class="jxr_keyword">new</strong> Put(row2);
+<a class="jxr_linenumber" name="313" href="#313">313</a> putData1R2Q2.addColumn(TEST_FAMILY.getBytes(), qualifier2, data1_q2);
+<a class="jxr_linenumber" name="314" href="#314">314</a> txTable.put(tx1, putData1R2Q2);
+<a class="jxr_linenumber" name="315" href="#315">315</a>
+<a class="jxr_linenumber" name="316" href="#316">316</a> <em class="jxr_comment">// Provoke change in mastership (should throw a Connection exception)</em>
<a class="jxr_linenumber" name="317" href="#317">317</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++++++++++++++++++++++++++++++++++++"</span>);
-<a class="jxr_linenumber" name="318" href="#318">318</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++ KILLING TSO 1 +++++++++++++++++++"</span>);
-<a class="jxr_linenumber" name="319" href="#319">319</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++++++++++++++++++++++++++++++++++++"</span>);
+<a class="jxr_linenumber" name="318" href="#318">318</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++++++++++++++++++++++++++++++++++++"</span>);
+<a class="jxr_linenumber" name="319" href="#319">319</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++ KILLING TSO 1 +++++++++++++++++++"</span>);
<a class="jxr_linenumber" name="320" href="#320">320</a> LOG.info(<span class="jxr_string">"++++++++++++++++++++++++++++++++++++++++++++++++++++++"</span>);
-<a class="jxr_linenumber" name="321" href="#321">321</a> tso1.stopAndWait();
-<a class="jxr_linenumber" name="322" href="#322">322</a> TestUtils.waitForSocketNotListening(<span class="jxr_string">"localhost"</span>, TSO1_PORT, 100);
-<a class="jxr_linenumber" name="323" href="#323">323</a>
-<a class="jxr_linenumber" name="324" href="#324">324</a> <em class="jxr_comment">// Try to commit, but it should abort due to the change in mastership</em>
-<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> tm.commit(tx1);
-<a class="jxr_linenumber" name="327" href="#327">327</a> String failMsg = String.format(<span class="jxr_string">"%s should not commit. Initial epoch was: %d"</span>, tx1, initialEpoch);
-<a class="jxr_linenumber" name="328" href="#328">328</a> fail(failMsg);
-<a class="jxr_linenumber" name="329" href="#329">329</a> } <strong class="jxr_keyword">catch</strong> (RollbackException e) {
-<a class="jxr_linenumber" name="330" href="#330">330</a> <em class="jxr_comment">// Expected</em>
-<a class="jxr_linenumber" name="331" href="#331">331</a> LOG.info(<span class="jxr_string">"Rollback cause for Tx {}: "</span>, tx1, e.getCause());
-<a class="jxr_linenumber" name="332" href="#332">332</a> assertEquals(tx1.getStatus(), Transaction.Status.ROLLEDBACK);
-<a class="jxr_linenumber" name="333" href="#333">333</a> assertEquals(tx1.getEpoch(), initialEpoch);
-<a class="jxr_linenumber" name="334" href="#334">334</a> }
-<a class="jxr_linenumber" name="335" href="#335">335</a>
-<a class="jxr_linenumber" name="336" href="#336">336</a> LOG.info(<span class="jxr_string">"Sleep some time till the client is informed about"</span>
-<a class="jxr_linenumber" name="337" href="#337">337</a> + <span class="jxr_string">"the new TSO connection parameters and how can connect"</span>);
-<a class="jxr_linenumber" name="338" href="#338">338</a> TimeUnit.SECONDS.sleep(10 + 2);
-<a class="jxr_linenumber" name="339" href="#339">339</a>
-<a class="jxr_linenumber" name="340" href="#340">340</a> HBaseTransaction tx2 = (HBaseTransaction) tm.begin();
-<a class="jxr_linenumber" name="341" href="#341">341</a> LOG.info(<span class="jxr_string">"Starting Tx {} writing values for cells ({}, {}) "</span>, tx2, Bytes.toString(data1_q1),
-<a class="jxr_linenumber" name="342" href="#342">342</a> Bytes.toString(data1_q2));
-<a class="jxr_linenumber" name="343" href="#343">343</a> Get getData1R1Q1 = <strong class="jxr_keyword">new</strong> Get(row1).setMaxVersions(1);
-<a class="jxr_linenumber" name="344" href="#344">344</a> Result r = txTable.get(tx2, getData1R1Q1);
-<a class="jxr_linenumber" name="345" href="#345">345</a> assertEquals(r.getValue(TEST_FAMILY.getBytes(), qualifier1), initialData,
-<a class="jxr_linenumber" name="346" href="#346">346</a> <span class="jxr_string">"Unexpected value for SI read R1Q1"</span> + tx2 + <span class="jxr_string">": "</span>
-<a class="jxr_linenumber" name="347" href="#347">347</a> + Bytes.toString(r.getValue(TEST_FAMILY.getBytes(), qualifier1)));
-<a class="jxr_linenumber" name="348" href="#348">348</a> Get getData1R2Q2 = <strong class="jxr_keyword">new</strong> Get(row2).setMaxVersions(1);
-<a class="jxr_linenumber" name="349" href="#349">349</a> r = txTable.get(tx2, getData1R2Q2);
-<a class="jxr_linenumber" name="350" href="#350">350</a> assertEquals(r.getValue(TEST_FAMILY.getBytes(), qualifier2), initialData,
-<a class="jxr_linenumber" name="351" href="#351">351</a> <span class="jxr_string">"Unexpected value for SI read R1Q1"</span> + tx2 + <span class="jxr_string">": "</span>
-<a class="jxr_linenumber" name="352" href="#352">352</a> + Bytes.toString(r.getValue(TEST_FAMILY.getBytes(), qualifier2)));
-<a class="jxr_linenumber" name="353" href="#353">353</a>
-<a class="jxr_linenumber" name="354" href="#354">354</a> Put putData2R1Q1 = <strong class="jxr_keyword">new</strong> Put(row1);
-<a class="jxr_linenumber" name="355" href="#355">355</a> putData2R1Q1.add(TEST_FAMILY.getBytes(), qualifier1, data2_q1);
-<a class="jxr_linenumber" name="356" href="#356">356</a> txTable.put(tx2, putData2R1Q1);
-<a class="jxr_linenumber" name="357" href="#357">357</a> Put putData2R2Q2 = <strong class="jxr_keyword">new</strong> Put(row2);
-<a class="jxr_linenumber" name="358" href="#358">358</a> putData2R2Q2.add(TEST_FAMILY.getBytes(), qualifier2, data2_q2);
-<a class="jxr_linenumber" name="359" href="#359">359</a> txTable.put(tx2, putData2R2Q2);
-<a class="jxr_linenumber" name="360" href="#360">360</a> <em class="jxr_comment">// This one should commit in the new TSO</em>
-<a class="jxr_linenumber" name="361" href="#361">361</a> tm.commit(tx2);
-<a class="jxr_linenumber" name="362" href="#362">362</a>
-<a class="jxr_linenumber" name="363" href="#363">363</a> assertEquals(tx2.getStatus(), Transaction.Status.COMMITTED);
-<a class="jxr_linenumber" name="364" href="#364">364</a> assertTrue(tx2.getEpoch() > tx0.getCommitTimestamp());
-<a class="jxr_linenumber" name="365" href="#365">365</a>
-<a class="jxr_linenumber" name="366" href="#366">366</a> checkRowValues(txTable, data2_q1, data2_q2);
-<a class="jxr_linenumber" name="367" href="#367">367</a> }
-<a class="jxr_linenumber" name="368" href="#368">368</a>
-<a class="jxr_linenumber" name="369" href="#369">369</a> }
-<a class="jxr_linenumber" name="370" href="#370">370</a>
-<a class="jxr_linenumber" name="371" href="#371">371</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> checkRowValues(TTable txTable, byte[] expectedDataR1Q1, byte[] expectedDataR2Q2)
-<a class="jxr_linenumber" name="372" href="#372">372</a> <strong class="jxr_keyword">throws</strong> IOException, Rollb
<TRUNCATED>