http://git-wip-us.apache.org/repos/asf/hbase-site/blob/849d84a8/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServer.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServer.html index 60f13e3..ec94f7a 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServer.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServer.html @@ -25,36 +25,36 @@ <span class="sourceLineNo">017</span> */<a name="line.17"></a> <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.thrift;<a name="line.18"></a> <span class="sourceLineNo">019</span><a name="line.19"></a> -<span class="sourceLineNo">020</span>import static org.junit.Assert.assertArrayEquals;<a name="line.20"></a> -<span class="sourceLineNo">021</span>import static org.junit.Assert.assertEquals;<a name="line.21"></a> -<span class="sourceLineNo">022</span>import static org.junit.Assert.assertFalse;<a name="line.22"></a> -<span class="sourceLineNo">023</span>import static org.junit.Assert.assertTrue;<a name="line.23"></a> -<span class="sourceLineNo">024</span>import static org.junit.Assert.fail;<a name="line.24"></a> -<span class="sourceLineNo">025</span><a name="line.25"></a> -<span class="sourceLineNo">026</span>import java.io.IOException;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import java.nio.ByteBuffer;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import java.util.ArrayList;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import java.util.Collection;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import java.util.HashMap;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import java.util.List;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import java.util.Map;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import org.apache.hadoop.conf.Configuration;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.CompatibilityFactory;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HConstants;<a name="line.38"></a> -<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.TableName;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.client.Put;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Table;<a name="line.43"></a> -<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.filter.ParseFilter;<a name="line.44"></a> -<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.security.UserProvider;<a name="line.45"></a> -<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.test.MetricsAssertHelper;<a name="line.46"></a> -<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.47"></a> -<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.48"></a> -<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.thrift.ThriftServerRunner.HBaseHandler;<a name="line.49"></a> +<span class="sourceLineNo">020</span>import static org.apache.hadoop.hbase.thrift.Constants.COALESCE_INC_KEY;<a name="line.20"></a> +<span class="sourceLineNo">021</span>import static org.junit.Assert.assertArrayEquals;<a name="line.21"></a> +<span class="sourceLineNo">022</span>import static org.junit.Assert.assertEquals;<a name="line.22"></a> +<span class="sourceLineNo">023</span>import static org.junit.Assert.assertFalse;<a name="line.23"></a> +<span class="sourceLineNo">024</span>import static org.junit.Assert.assertTrue;<a name="line.24"></a> +<span class="sourceLineNo">025</span>import static org.junit.Assert.fail;<a name="line.25"></a> +<span class="sourceLineNo">026</span><a name="line.26"></a> +<span class="sourceLineNo">027</span>import java.io.IOException;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import java.nio.ByteBuffer;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import java.util.ArrayList;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import java.util.Collection;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import java.util.HashMap;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import java.util.List;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import java.util.Map;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import org.apache.hadoop.conf.Configuration;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.CompatibilityFactory;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.36"></a> +<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.38"></a> +<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HConstants;<a name="line.39"></a> +<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.TableName;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Put;<a name="line.43"></a> +<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Table;<a name="line.44"></a> +<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.filter.ParseFilter;<a name="line.45"></a> +<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.security.UserProvider;<a name="line.46"></a> +<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.test.MetricsAssertHelper;<a name="line.47"></a> +<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.48"></a> +<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.49"></a> <span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.thrift.generated.BatchMutation;<a name="line.50"></a> <span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.thrift.generated.ColumnDescriptor;<a name="line.51"></a> <span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.thrift.generated.Hbase;<a name="line.52"></a> @@ -79,7 +79,7 @@ <span class="sourceLineNo">071</span>import org.slf4j.LoggerFactory;<a name="line.71"></a> <span class="sourceLineNo">072</span><a name="line.72"></a> <span class="sourceLineNo">073</span>/**<a name="line.73"></a> -<span class="sourceLineNo">074</span> * Unit testing for ThriftServerRunner.HBaseHandler, a part of the<a name="line.74"></a> +<span class="sourceLineNo">074</span> * Unit testing for ThriftServerRunner.HBaseServiceHandler, a part of the<a name="line.74"></a> <span class="sourceLineNo">075</span> * org.apache.hadoop.hbase.thrift package.<a name="line.75"></a> <span class="sourceLineNo">076</span> */<a name="line.76"></a> <span class="sourceLineNo">077</span>@Category({ClientTests.class, LargeTests.class})<a name="line.77"></a> @@ -121,7 +121,7 @@ <span class="sourceLineNo">113</span><a name="line.113"></a> <span class="sourceLineNo">114</span> @BeforeClass<a name="line.114"></a> <span class="sourceLineNo">115</span> public static void beforeClass() throws Exception {<a name="line.115"></a> -<span class="sourceLineNo">116</span> UTIL.getConfiguration().setBoolean(ThriftServerRunner.COALESCE_INC_KEY, true);<a name="line.116"></a> +<span class="sourceLineNo">116</span> UTIL.getConfiguration().setBoolean(COALESCE_INC_KEY, true);<a name="line.116"></a> <span class="sourceLineNo">117</span> UTIL.getConfiguration().setBoolean("hbase.table.sanity.checks", false);<a name="line.117"></a> <span class="sourceLineNo">118</span> UTIL.getConfiguration().setInt("hbase.client.retries.number", 3);<a name="line.118"></a> <span class="sourceLineNo">119</span> UTIL.startMiniCluster();<a name="line.119"></a> @@ -160,8 +160,8 @@ <span class="sourceLineNo">152</span> * IllegalArgument exception.<a name="line.152"></a> <span class="sourceLineNo">153</span> */<a name="line.153"></a> <span class="sourceLineNo">154</span> public void doTestTableCreateDrop() throws Exception {<a name="line.154"></a> -<span class="sourceLineNo">155</span> ThriftServerRunner.HBaseHandler handler =<a name="line.155"></a> -<span class="sourceLineNo">156</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.156"></a> +<span class="sourceLineNo">155</span> ThriftHBaseServiceHandler handler =<a name="line.155"></a> +<span class="sourceLineNo">156</span> new ThriftHBaseServiceHandler(UTIL.getConfiguration(),<a name="line.156"></a> <span class="sourceLineNo">157</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.157"></a> <span class="sourceLineNo">158</span> doTestTableCreateDrop(handler);<a name="line.158"></a> <span class="sourceLineNo">159</span> }<a name="line.159"></a> @@ -171,7 +171,7 @@ <span class="sourceLineNo">163</span> dropTestTables(handler);<a name="line.163"></a> <span class="sourceLineNo">164</span> }<a name="line.164"></a> <span class="sourceLineNo">165</span><a name="line.165"></a> -<span class="sourceLineNo">166</span> public static final class MySlowHBaseHandler extends ThriftServerRunner.HBaseHandler<a name="line.166"></a> +<span class="sourceLineNo">166</span> public static final class MySlowHBaseHandler extends ThriftHBaseServiceHandler<a name="line.166"></a> <span class="sourceLineNo">167</span> implements Hbase.Iface {<a name="line.167"></a> <span class="sourceLineNo">168</span><a name="line.168"></a> <span class="sourceLineNo">169</span> protected MySlowHBaseHandler(Configuration c)<a name="line.169"></a> @@ -238,7 +238,7 @@ <span class="sourceLineNo">230</span> private static Hbase.Iface getHandlerForMetricsTest(ThriftMetrics metrics, Configuration conf)<a name="line.230"></a> <span class="sourceLineNo">231</span> throws Exception {<a name="line.231"></a> <span class="sourceLineNo">232</span> Hbase.Iface handler = new MySlowHBaseHandler(conf);<a name="line.232"></a> -<span class="sourceLineNo">233</span> return HbaseHandlerMetricsProxy.newInstance(handler, metrics, conf);<a name="line.233"></a> +<span class="sourceLineNo">233</span> return HbaseHandlerMetricsProxy.newInstance((ThriftHBaseServiceHandler)handler, metrics, conf);<a name="line.233"></a> <span class="sourceLineNo">234</span> }<a name="line.234"></a> <span class="sourceLineNo">235</span><a name="line.235"></a> <span class="sourceLineNo">236</span> private static ThriftMetrics getMetrics(Configuration conf) throws Exception {<a name="line.236"></a> @@ -278,15 +278,15 @@ <span class="sourceLineNo">270</span> }<a name="line.270"></a> <span class="sourceLineNo">271</span><a name="line.271"></a> <span class="sourceLineNo">272</span> public void doTestIncrements() throws Exception {<a name="line.272"></a> -<span class="sourceLineNo">273</span> ThriftServerRunner.HBaseHandler handler =<a name="line.273"></a> -<span class="sourceLineNo">274</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.274"></a> +<span class="sourceLineNo">273</span> ThriftHBaseServiceHandler handler =<a name="line.273"></a> +<span class="sourceLineNo">274</span> new ThriftHBaseServiceHandler(UTIL.getConfiguration(),<a name="line.274"></a> <span class="sourceLineNo">275</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.275"></a> <span class="sourceLineNo">276</span> createTestTables(handler);<a name="line.276"></a> <span class="sourceLineNo">277</span> doTestIncrements(handler);<a name="line.277"></a> <span class="sourceLineNo">278</span> dropTestTables(handler);<a name="line.278"></a> <span class="sourceLineNo">279</span> }<a name="line.279"></a> <span class="sourceLineNo">280</span><a name="line.280"></a> -<span class="sourceLineNo">281</span> public static void doTestIncrements(HBaseHandler handler) throws Exception {<a name="line.281"></a> +<span class="sourceLineNo">281</span> public static void doTestIncrements(ThriftHBaseServiceHandler handler) throws Exception {<a name="line.281"></a> <span class="sourceLineNo">282</span> List<Mutation> mutations = new ArrayList<>(1);<a name="line.282"></a> <span class="sourceLineNo">283</span> mutations.add(new Mutation(false, columnAAname, valueEname, true));<a name="line.283"></a> <span class="sourceLineNo">284</span> mutations.add(new Mutation(false, columnAname, valueEname, true));<a name="line.284"></a> @@ -326,8 +326,8 @@ <span class="sourceLineNo">318</span> * versions.<a name="line.318"></a> <span class="sourceLineNo">319</span> */<a name="line.319"></a> <span class="sourceLineNo">320</span> public void doTestTableMutations() throws Exception {<a name="line.320"></a> -<span class="sourceLineNo">321</span> ThriftServerRunner.HBaseHandler handler =<a name="line.321"></a> -<span class="sourceLineNo">322</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.322"></a> +<span class="sourceLineNo">321</span> ThriftHBaseServiceHandler handler =<a name="line.321"></a> +<span class="sourceLineNo">322</span> new ThriftHBaseServiceHandler(UTIL.getConfiguration(),<a name="line.322"></a> <span class="sourceLineNo">323</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.323"></a> <span class="sourceLineNo">324</span> doTestTableMutations(handler);<a name="line.324"></a> <span class="sourceLineNo">325</span> }<a name="line.325"></a> @@ -403,8 +403,8 @@ <span class="sourceLineNo">395</span> */<a name="line.395"></a> <span class="sourceLineNo">396</span> public void doTestTableTimestampsAndColumns() throws Exception {<a name="line.396"></a> <span class="sourceLineNo">397</span> // Setup<a name="line.397"></a> -<span class="sourceLineNo">398</span> ThriftServerRunner.HBaseHandler handler =<a name="line.398"></a> -<span class="sourceLineNo">399</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.399"></a> +<span class="sourceLineNo">398</span> ThriftHBaseServiceHandler handler =<a name="line.398"></a> +<span class="sourceLineNo">399</span> new ThriftHBaseServiceHandler(UTIL.getConfiguration(),<a name="line.399"></a> <span class="sourceLineNo">400</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.400"></a> <span class="sourceLineNo">401</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.401"></a> <span class="sourceLineNo">402</span><a name="line.402"></a> @@ -481,8 +481,8 @@ <span class="sourceLineNo">473</span> */<a name="line.473"></a> <span class="sourceLineNo">474</span> public void doTestTableScanners() throws Exception {<a name="line.474"></a> <span class="sourceLineNo">475</span> // Setup<a name="line.475"></a> -<span class="sourceLineNo">476</span> ThriftServerRunner.HBaseHandler handler =<a name="line.476"></a> -<span class="sourceLineNo">477</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.477"></a> +<span class="sourceLineNo">476</span> ThriftHBaseServiceHandler handler =<a name="line.476"></a> +<span class="sourceLineNo">477</span> new ThriftHBaseServiceHandler(UTIL.getConfiguration(),<a name="line.477"></a> <span class="sourceLineNo">478</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.478"></a> <span class="sourceLineNo">479</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.479"></a> <span class="sourceLineNo">480</span><a name="line.480"></a> @@ -600,8 +600,8 @@ <span class="sourceLineNo">592</span> * Tests for GetTableRegions<a name="line.592"></a> <span class="sourceLineNo">593</span> */<a name="line.593"></a> <span class="sourceLineNo">594</span> public void doTestGetTableRegions() throws Exception {<a name="line.594"></a> -<span class="sourceLineNo">595</span> ThriftServerRunner.HBaseHandler handler =<a name="line.595"></a> -<span class="sourceLineNo">596</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.596"></a> +<span class="sourceLineNo">595</span> ThriftHBaseServiceHandler handler =<a name="line.595"></a> +<span class="sourceLineNo">596</span> new ThriftHBaseServiceHandler(UTIL.getConfiguration(),<a name="line.596"></a> <span class="sourceLineNo">597</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.597"></a> <span class="sourceLineNo">598</span> doTestGetTableRegions(handler);<a name="line.598"></a> <span class="sourceLineNo">599</span> }<a name="line.599"></a> @@ -628,7 +628,7 @@ <span class="sourceLineNo">620</span><a name="line.620"></a> <span class="sourceLineNo">621</span> conf.set("hbase.thrift.filters", "MyFilter:filterclass");<a name="line.621"></a> <span class="sourceLineNo">622</span><a name="line.622"></a> -<span class="sourceLineNo">623</span> ThriftServerRunner.registerFilters(conf);<a name="line.623"></a> +<span class="sourceLineNo">623</span> ThriftServer.registerFilters(conf);<a name="line.623"></a> <span class="sourceLineNo">624</span><a name="line.624"></a> <span class="sourceLineNo">625</span> Map<String, String> registeredFilters = ParseFilter.getAllFilters();<a name="line.625"></a> <span class="sourceLineNo">626</span><a name="line.626"></a> @@ -636,8 +636,8 @@ <span class="sourceLineNo">628</span> }<a name="line.628"></a> <span class="sourceLineNo">629</span><a name="line.629"></a> <span class="sourceLineNo">630</span> public void doTestGetRegionInfo() throws Exception {<a name="line.630"></a> -<span class="sourceLineNo">631</span> ThriftServerRunner.HBaseHandler handler =<a name="line.631"></a> -<span class="sourceLineNo">632</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.632"></a> +<span class="sourceLineNo">631</span> ThriftHBaseServiceHandler handler =<a name="line.631"></a> +<span class="sourceLineNo">632</span> new ThriftHBaseServiceHandler(UTIL.getConfiguration(),<a name="line.632"></a> <span class="sourceLineNo">633</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.633"></a> <span class="sourceLineNo">634</span> doTestGetRegionInfo(handler);<a name="line.634"></a> <span class="sourceLineNo">635</span> }<a name="line.635"></a> @@ -663,8 +663,8 @@ <span class="sourceLineNo">655</span> * Appends the value to a cell and checks that the cell value is updated properly.<a name="line.655"></a> <span class="sourceLineNo">656</span> */<a name="line.656"></a> <span class="sourceLineNo">657</span> public static void doTestAppend() throws Exception {<a name="line.657"></a> -<span class="sourceLineNo">658</span> ThriftServerRunner.HBaseHandler handler =<a name="line.658"></a> -<span class="sourceLineNo">659</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.659"></a> +<span class="sourceLineNo">658</span> ThriftHBaseServiceHandler handler =<a name="line.658"></a> +<span class="sourceLineNo">659</span> new ThriftHBaseServiceHandler(UTIL.getConfiguration(),<a name="line.659"></a> <span class="sourceLineNo">660</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.660"></a> <span class="sourceLineNo">661</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.661"></a> <span class="sourceLineNo">662</span> try {<a name="line.662"></a> @@ -695,8 +695,8 @@ <span class="sourceLineNo">687</span> * the checkAndPut succeeds.<a name="line.687"></a> <span class="sourceLineNo">688</span> */<a name="line.688"></a> <span class="sourceLineNo">689</span> public static void doTestCheckAndPut() throws Exception {<a name="line.689"></a> -<span class="sourceLineNo">690</span> ThriftServerRunner.HBaseHandler handler =<a name="line.690"></a> -<span class="sourceLineNo">691</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.691"></a> +<span class="sourceLineNo">690</span> ThriftHBaseServiceHandler handler =<a name="line.690"></a> +<span class="sourceLineNo">691</span> new ThriftHBaseServiceHandler(UTIL.getConfiguration(),<a name="line.691"></a> <span class="sourceLineNo">692</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.692"></a> <span class="sourceLineNo">693</span> handler.createTable(tableAname, getColumnDescriptors());<a name="line.693"></a> <span class="sourceLineNo">694</span> try {<a name="line.694"></a> @@ -737,8 +737,8 @@ <span class="sourceLineNo">729</span><a name="line.729"></a> <span class="sourceLineNo">730</span> Configuration conf = UTIL.getConfiguration();<a name="line.730"></a> <span class="sourceLineNo">731</span> ThriftMetrics metrics = getMetrics(conf);<a name="line.731"></a> -<span class="sourceLineNo">732</span> ThriftServerRunner.HBaseHandler hbaseHandler =<a name="line.732"></a> -<span class="sourceLineNo">733</span> new ThriftServerRunner.HBaseHandler(UTIL.getConfiguration(),<a name="line.733"></a> +<span class="sourceLineNo">732</span> ThriftHBaseServiceHandler hbaseHandler =<a name="line.732"></a> +<span class="sourceLineNo">733</span> new ThriftHBaseServiceHandler(UTIL.getConfiguration(),<a name="line.733"></a> <span class="sourceLineNo">734</span> UserProvider.instantiate(UTIL.getConfiguration()));<a name="line.734"></a> <span class="sourceLineNo">735</span> Hbase.Iface handler = HbaseHandlerMetricsProxy.newInstance(hbaseHandler, metrics, conf);<a name="line.735"></a> <span class="sourceLineNo">736</span><a name="line.736"></a> @@ -871,10 +871,10 @@ <span class="sourceLineNo">863</span> * the scanner.<a name="line.863"></a> <span class="sourceLineNo">864</span> *<a name="line.864"></a> <span class="sourceLineNo">865</span> * @param scannerId the scanner to close<a name="line.865"></a> -<span class="sourceLineNo">866</span> * @param handler the HBaseHandler interfacing to HBase<a name="line.866"></a> +<span class="sourceLineNo">866</span> * @param handler the HBaseServiceHandler interfacing to HBase<a name="line.866"></a> <span class="sourceLineNo">867</span> */<a name="line.867"></a> <span class="sourceLineNo">868</span> private void closeScanner(<a name="line.868"></a> -<span class="sourceLineNo">869</span> int scannerId, ThriftServerRunner.HBaseHandler handler) throws Exception {<a name="line.869"></a> +<span class="sourceLineNo">869</span> int scannerId, ThriftHBaseServiceHandler handler) throws Exception {<a name="line.869"></a> <span class="sourceLineNo">870</span> handler.scannerGet(scannerId);<a name="line.870"></a> <span class="sourceLineNo">871</span> handler.scannerClose(scannerId);<a name="line.871"></a> <span class="sourceLineNo">872</span> }<a name="line.872"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/849d84a8/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.html index 54b2f1c..a414914 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.html @@ -25,241 +25,251 @@ <span class="sourceLineNo">017</span> */<a name="line.17"></a> <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.thrift;<a name="line.18"></a> <span class="sourceLineNo">019</span><a name="line.19"></a> -<span class="sourceLineNo">020</span>import static org.junit.Assert.assertEquals;<a name="line.20"></a> -<span class="sourceLineNo">021</span>import static org.junit.Assert.assertTrue;<a name="line.21"></a> -<span class="sourceLineNo">022</span><a name="line.22"></a> -<span class="sourceLineNo">023</span>import java.net.InetAddress;<a name="line.23"></a> -<span class="sourceLineNo">024</span>import java.util.ArrayList;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import java.util.Collection;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import java.util.List;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.thrift.ThriftServerRunner.ImplType;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.thrift.generated.Hbase;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.util.IncrementingEnvironmentEdge;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.thrift.protocol.TBinaryProtocol;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.thrift.protocol.TCompactProtocol;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.thrift.protocol.TProtocol;<a name="line.38"></a> -<span class="sourceLineNo">039</span>import org.apache.thrift.server.TServer;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.apache.thrift.transport.TFramedTransport;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.apache.thrift.transport.TSocket;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.apache.thrift.transport.TTransport;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.junit.AfterClass;<a name="line.43"></a> -<span class="sourceLineNo">044</span>import org.junit.BeforeClass;<a name="line.44"></a> -<span class="sourceLineNo">045</span>import org.junit.ClassRule;<a name="line.45"></a> -<span class="sourceLineNo">046</span>import org.junit.Test;<a name="line.46"></a> -<span class="sourceLineNo">047</span>import org.junit.experimental.categories.Category;<a name="line.47"></a> -<span class="sourceLineNo">048</span>import org.junit.runner.RunWith;<a name="line.48"></a> -<span class="sourceLineNo">049</span>import org.junit.runners.Parameterized;<a name="line.49"></a> -<span class="sourceLineNo">050</span>import org.junit.runners.Parameterized.Parameters;<a name="line.50"></a> -<span class="sourceLineNo">051</span>import org.slf4j.Logger;<a name="line.51"></a> -<span class="sourceLineNo">052</span>import org.slf4j.LoggerFactory;<a name="line.52"></a> -<span class="sourceLineNo">053</span><a name="line.53"></a> -<span class="sourceLineNo">054</span>import org.apache.hbase.thirdparty.com.google.common.base.Joiner;<a name="line.54"></a> -<span class="sourceLineNo">055</span><a name="line.55"></a> -<span class="sourceLineNo">056</span>/**<a name="line.56"></a> -<span class="sourceLineNo">057</span> * Start the HBase Thrift server on a random port through the command-line<a name="line.57"></a> -<span class="sourceLineNo">058</span> * interface and talk to it from client side.<a name="line.58"></a> -<span class="sourceLineNo">059</span> */<a name="line.59"></a> -<span class="sourceLineNo">060</span>@Category({ClientTests.class, LargeTests.class})<a name="line.60"></a> -<span class="sourceLineNo">061</span>@RunWith(Parameterized.class)<a name="line.61"></a> -<span class="sourceLineNo">062</span>public class TestThriftServerCmdLine {<a name="line.62"></a> -<span class="sourceLineNo">063</span><a name="line.63"></a> -<span class="sourceLineNo">064</span> @ClassRule<a name="line.64"></a> -<span class="sourceLineNo">065</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.65"></a> -<span class="sourceLineNo">066</span> HBaseClassTestRule.forClass(TestThriftServerCmdLine.class);<a name="line.66"></a> +<span class="sourceLineNo">020</span>import static org.apache.hadoop.hbase.thrift.Constants.BIND_OPTION;<a name="line.20"></a> +<span class="sourceLineNo">021</span>import static org.apache.hadoop.hbase.thrift.Constants.COMPACT_OPTION;<a name="line.21"></a> +<span class="sourceLineNo">022</span>import static org.apache.hadoop.hbase.thrift.Constants.FRAMED_OPTION;<a name="line.22"></a> +<span class="sourceLineNo">023</span>import static org.apache.hadoop.hbase.thrift.Constants.INFOPORT_OPTION;<a name="line.23"></a> +<span class="sourceLineNo">024</span>import static org.apache.hadoop.hbase.thrift.Constants.PORT_OPTION;<a name="line.24"></a> +<span class="sourceLineNo">025</span>import static org.junit.Assert.assertEquals;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import static org.junit.Assert.assertTrue;<a name="line.26"></a> +<span class="sourceLineNo">027</span><a name="line.27"></a> +<span class="sourceLineNo">028</span>import java.net.InetAddress;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import java.util.ArrayList;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import java.util.Collection;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import java.util.List;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.thrift.generated.Hbase;<a name="line.36"></a> +<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;<a name="line.38"></a> +<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.IncrementingEnvironmentEdge;<a name="line.39"></a> +<span class="sourceLineNo">040</span>import org.apache.thrift.protocol.TBinaryProtocol;<a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.apache.thrift.protocol.TCompactProtocol;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.apache.thrift.protocol.TProtocol;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.apache.thrift.server.TServer;<a name="line.43"></a> +<span class="sourceLineNo">044</span>import org.apache.thrift.transport.TFramedTransport;<a name="line.44"></a> +<span class="sourceLineNo">045</span>import org.apache.thrift.transport.TSocket;<a name="line.45"></a> +<span class="sourceLineNo">046</span>import org.apache.thrift.transport.TTransport;<a name="line.46"></a> +<span class="sourceLineNo">047</span>import org.junit.AfterClass;<a name="line.47"></a> +<span class="sourceLineNo">048</span>import org.junit.BeforeClass;<a name="line.48"></a> +<span class="sourceLineNo">049</span>import org.junit.ClassRule;<a name="line.49"></a> +<span class="sourceLineNo">050</span>import org.junit.Test;<a name="line.50"></a> +<span class="sourceLineNo">051</span>import org.junit.experimental.categories.Category;<a name="line.51"></a> +<span class="sourceLineNo">052</span>import org.junit.runner.RunWith;<a name="line.52"></a> +<span class="sourceLineNo">053</span>import org.junit.runners.Parameterized;<a name="line.53"></a> +<span class="sourceLineNo">054</span>import org.junit.runners.Parameterized.Parameters;<a name="line.54"></a> +<span class="sourceLineNo">055</span>import org.slf4j.Logger;<a name="line.55"></a> +<span class="sourceLineNo">056</span>import org.slf4j.LoggerFactory;<a name="line.56"></a> +<span class="sourceLineNo">057</span><a name="line.57"></a> +<span class="sourceLineNo">058</span>import org.apache.hbase.thirdparty.com.google.common.base.Joiner;<a name="line.58"></a> +<span class="sourceLineNo">059</span><a name="line.59"></a> +<span class="sourceLineNo">060</span>/**<a name="line.60"></a> +<span class="sourceLineNo">061</span> * Start the HBase Thrift server on a random port through the command-line<a name="line.61"></a> +<span class="sourceLineNo">062</span> * interface and talk to it from client side.<a name="line.62"></a> +<span class="sourceLineNo">063</span> */<a name="line.63"></a> +<span class="sourceLineNo">064</span>@Category({ClientTests.class, LargeTests.class})<a name="line.64"></a> +<span class="sourceLineNo">065</span>@RunWith(Parameterized.class)<a name="line.65"></a> +<span class="sourceLineNo">066</span>public class TestThriftServerCmdLine {<a name="line.66"></a> <span class="sourceLineNo">067</span><a name="line.67"></a> -<span class="sourceLineNo">068</span> private static final Logger LOG =<a name="line.68"></a> -<span class="sourceLineNo">069</span> LoggerFactory.getLogger(TestThriftServerCmdLine.class);<a name="line.69"></a> -<span class="sourceLineNo">070</span><a name="line.70"></a> -<span class="sourceLineNo">071</span> private final ImplType implType;<a name="line.71"></a> -<span class="sourceLineNo">072</span> private boolean specifyFramed;<a name="line.72"></a> -<span class="sourceLineNo">073</span> private boolean specifyBindIP;<a name="line.73"></a> -<span class="sourceLineNo">074</span> private boolean specifyCompact;<a name="line.74"></a> -<span class="sourceLineNo">075</span><a name="line.75"></a> -<span class="sourceLineNo">076</span> private static final HBaseTestingUtility TEST_UTIL =<a name="line.76"></a> -<span class="sourceLineNo">077</span> new HBaseTestingUtility();<a name="line.77"></a> -<span class="sourceLineNo">078</span><a name="line.78"></a> -<span class="sourceLineNo">079</span> private Thread cmdLineThread;<a name="line.79"></a> -<span class="sourceLineNo">080</span> private volatile Exception cmdLineException;<a name="line.80"></a> -<span class="sourceLineNo">081</span><a name="line.81"></a> -<span class="sourceLineNo">082</span> private Exception clientSideException;<a name="line.82"></a> -<span class="sourceLineNo">083</span><a name="line.83"></a> -<span class="sourceLineNo">084</span> private ThriftServer thriftServer;<a name="line.84"></a> -<span class="sourceLineNo">085</span> private int port;<a name="line.85"></a> -<span class="sourceLineNo">086</span><a name="line.86"></a> -<span class="sourceLineNo">087</span> @Parameters<a name="line.87"></a> -<span class="sourceLineNo">088</span> public static Collection<Object[]> getParameters() {<a name="line.88"></a> -<span class="sourceLineNo">089</span> Collection<Object[]> parameters = new ArrayList<>();<a name="line.89"></a> -<span class="sourceLineNo">090</span> for (ImplType implType : ImplType.values()) {<a name="line.90"></a> -<span class="sourceLineNo">091</span> for (boolean specifyFramed : new boolean[] {false, true}) {<a name="line.91"></a> -<span class="sourceLineNo">092</span> for (boolean specifyBindIP : new boolean[] {false, true}) {<a name="line.92"></a> -<span class="sourceLineNo">093</span> if (specifyBindIP && !implType.canSpecifyBindIP) {<a name="line.93"></a> -<span class="sourceLineNo">094</span> continue;<a name="line.94"></a> -<span class="sourceLineNo">095</span> }<a name="line.95"></a> -<span class="sourceLineNo">096</span> for (boolean specifyCompact : new boolean[] {false, true}) {<a name="line.96"></a> -<span class="sourceLineNo">097</span> parameters.add(new Object[] {<a name="line.97"></a> -<span class="sourceLineNo">098</span> implType, specifyFramed, specifyBindIP, specifyCompact<a name="line.98"></a> -<span class="sourceLineNo">099</span> });<a name="line.99"></a> -<span class="sourceLineNo">100</span> }<a name="line.100"></a> -<span class="sourceLineNo">101</span> }<a name="line.101"></a> -<span class="sourceLineNo">102</span> }<a name="line.102"></a> -<span class="sourceLineNo">103</span> }<a name="line.103"></a> -<span class="sourceLineNo">104</span> return parameters;<a name="line.104"></a> -<span class="sourceLineNo">105</span> }<a name="line.105"></a> -<span class="sourceLineNo">106</span><a name="line.106"></a> -<span class="sourceLineNo">107</span> public TestThriftServerCmdLine(ImplType implType, boolean specifyFramed,<a name="line.107"></a> -<span class="sourceLineNo">108</span> boolean specifyBindIP, boolean specifyCompact) {<a name="line.108"></a> -<span class="sourceLineNo">109</span> this.implType = implType;<a name="line.109"></a> -<span class="sourceLineNo">110</span> this.specifyFramed = specifyFramed;<a name="line.110"></a> -<span class="sourceLineNo">111</span> this.specifyBindIP = specifyBindIP;<a name="line.111"></a> -<span class="sourceLineNo">112</span> this.specifyCompact = specifyCompact;<a name="line.112"></a> -<span class="sourceLineNo">113</span> LOG.debug(getParametersString());<a name="line.113"></a> -<span class="sourceLineNo">114</span> }<a name="line.114"></a> -<span class="sourceLineNo">115</span><a name="line.115"></a> -<span class="sourceLineNo">116</span> private String getParametersString() {<a name="line.116"></a> -<span class="sourceLineNo">117</span> return "implType=" + implType + ", " +<a name="line.117"></a> -<span class="sourceLineNo">118</span> "specifyFramed=" + specifyFramed + ", " +<a name="line.118"></a> -<span class="sourceLineNo">119</span> "specifyBindIP=" + specifyBindIP + ", " +<a name="line.119"></a> -<span class="sourceLineNo">120</span> "specifyCompact=" + specifyCompact;<a name="line.120"></a> -<span class="sourceLineNo">121</span> }<a name="line.121"></a> -<span class="sourceLineNo">122</span><a name="line.122"></a> -<span class="sourceLineNo">123</span> @BeforeClass<a name="line.123"></a> -<span class="sourceLineNo">124</span> public static void setUpBeforeClass() throws Exception {<a name="line.124"></a> -<span class="sourceLineNo">125</span> TEST_UTIL.getConfiguration().setBoolean("hbase.table.sanity.checks", false);<a name="line.125"></a> -<span class="sourceLineNo">126</span> TEST_UTIL.startMiniCluster();<a name="line.126"></a> -<span class="sourceLineNo">127</span> //ensure that server time increments every time we do an operation, otherwise<a name="line.127"></a> -<span class="sourceLineNo">128</span> //successive puts having the same timestamp will override each other<a name="line.128"></a> -<span class="sourceLineNo">129</span> EnvironmentEdgeManagerTestHelper.injectEdge(new IncrementingEnvironmentEdge());<a name="line.129"></a> -<span class="sourceLineNo">130</span> }<a name="line.130"></a> -<span class="sourceLineNo">131</span><a name="line.131"></a> -<span class="sourceLineNo">132</span> @AfterClass<a name="line.132"></a> -<span class="sourceLineNo">133</span> public static void tearDownAfterClass() throws Exception {<a name="line.133"></a> -<span class="sourceLineNo">134</span> TEST_UTIL.shutdownMiniCluster();<a name="line.134"></a> -<span class="sourceLineNo">135</span> EnvironmentEdgeManager.reset();<a name="line.135"></a> -<span class="sourceLineNo">136</span> }<a name="line.136"></a> -<span class="sourceLineNo">137</span><a name="line.137"></a> -<span class="sourceLineNo">138</span> private void startCmdLineThread(final String[] args) {<a name="line.138"></a> -<span class="sourceLineNo">139</span> LOG.info("Starting HBase Thrift server with command line: " + Joiner.on(" ").join(args));<a name="line.139"></a> -<span class="sourceLineNo">140</span><a name="line.140"></a> -<span class="sourceLineNo">141</span> cmdLineException = null;<a name="line.141"></a> -<span class="sourceLineNo">142</span> cmdLineThread = new Thread(new Runnable() {<a name="line.142"></a> -<span class="sourceLineNo">143</span> @Override<a name="line.143"></a> -<span class="sourceLineNo">144</span> public void run() {<a name="line.144"></a> -<span class="sourceLineNo">145</span> try {<a name="line.145"></a> -<span class="sourceLineNo">146</span> thriftServer.doMain(args);<a name="line.146"></a> -<span class="sourceLineNo">147</span> } catch (Exception e) {<a name="line.147"></a> -<span class="sourceLineNo">148</span> cmdLineException = e;<a name="line.148"></a> -<span class="sourceLineNo">149</span> }<a name="line.149"></a> -<span class="sourceLineNo">150</span> }<a name="line.150"></a> -<span class="sourceLineNo">151</span> });<a name="line.151"></a> -<span class="sourceLineNo">152</span> cmdLineThread.setName(ThriftServer.class.getSimpleName() +<a name="line.152"></a> -<span class="sourceLineNo">153</span> "-cmdline");<a name="line.153"></a> -<span class="sourceLineNo">154</span> cmdLineThread.start();<a name="line.154"></a> -<span class="sourceLineNo">155</span> }<a name="line.155"></a> -<span class="sourceLineNo">156</span><a name="line.156"></a> -<span class="sourceLineNo">157</span> @Test<a name="line.157"></a> -<span class="sourceLineNo">158</span> public void testRunThriftServer() throws Exception {<a name="line.158"></a> -<span class="sourceLineNo">159</span> List<String> args = new ArrayList<>();<a name="line.159"></a> -<span class="sourceLineNo">160</span> if (implType != null) {<a name="line.160"></a> -<span class="sourceLineNo">161</span> String serverTypeOption = implType.toString();<a name="line.161"></a> -<span class="sourceLineNo">162</span> assertTrue(serverTypeOption.startsWith("-"));<a name="line.162"></a> -<span class="sourceLineNo">163</span> args.add(serverTypeOption);<a name="line.163"></a> -<span class="sourceLineNo">164</span> }<a name="line.164"></a> -<span class="sourceLineNo">165</span> port = HBaseTestingUtility.randomFreePort();<a name="line.165"></a> -<span class="sourceLineNo">166</span> args.add("-" + ThriftServer.PORT_OPTION);<a name="line.166"></a> -<span class="sourceLineNo">167</span> args.add(String.valueOf(port));<a name="line.167"></a> -<span class="sourceLineNo">168</span> args.add("-" + ThriftServer.INFOPORT_OPTION);<a name="line.168"></a> -<span class="sourceLineNo">169</span> int infoPort = HBaseTestingUtility.randomFreePort();<a name="line.169"></a> -<span class="sourceLineNo">170</span> args.add(String.valueOf(infoPort));<a name="line.170"></a> -<span class="sourceLineNo">171</span><a name="line.171"></a> -<span class="sourceLineNo">172</span> if (specifyFramed) {<a name="line.172"></a> -<span class="sourceLineNo">173</span> args.add("-" + ThriftServer.FRAMED_OPTION);<a name="line.173"></a> -<span class="sourceLineNo">174</span> }<a name="line.174"></a> -<span class="sourceLineNo">175</span> if (specifyBindIP) {<a name="line.175"></a> -<span class="sourceLineNo">176</span> args.add("-" + ThriftServer.BIND_OPTION);<a name="line.176"></a> -<span class="sourceLineNo">177</span> args.add(InetAddress.getLocalHost().getHostName());<a name="line.177"></a> -<span class="sourceLineNo">178</span> }<a name="line.178"></a> -<span class="sourceLineNo">179</span> if (specifyCompact) {<a name="line.179"></a> -<span class="sourceLineNo">180</span> args.add("-" + ThriftServer.COMPACT_OPTION);<a name="line.180"></a> -<span class="sourceLineNo">181</span> }<a name="line.181"></a> -<span class="sourceLineNo">182</span> args.add("start");<a name="line.182"></a> -<span class="sourceLineNo">183</span><a name="line.183"></a> -<span class="sourceLineNo">184</span> thriftServer = new ThriftServer(TEST_UTIL.getConfiguration());<a name="line.184"></a> -<span class="sourceLineNo">185</span> startCmdLineThread(args.toArray(new String[args.size()]));<a name="line.185"></a> -<span class="sourceLineNo">186</span><a name="line.186"></a> -<span class="sourceLineNo">187</span> // wait up to 10s for the server to start<a name="line.187"></a> -<span class="sourceLineNo">188</span> for (int i = 0; i < 100<a name="line.188"></a> -<span class="sourceLineNo">189</span> && (thriftServer.serverRunner == null || thriftServer.serverRunner.tserver == null); i++) {<a name="line.189"></a> -<span class="sourceLineNo">190</span> Thread.sleep(100);<a name="line.190"></a> -<span class="sourceLineNo">191</span> }<a name="line.191"></a> +<span class="sourceLineNo">068</span> @ClassRule<a name="line.68"></a> +<span class="sourceLineNo">069</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.69"></a> +<span class="sourceLineNo">070</span> HBaseClassTestRule.forClass(TestThriftServerCmdLine.class);<a name="line.70"></a> +<span class="sourceLineNo">071</span><a name="line.71"></a> +<span class="sourceLineNo">072</span> private static final Logger LOG =<a name="line.72"></a> +<span class="sourceLineNo">073</span> LoggerFactory.getLogger(TestThriftServerCmdLine.class);<a name="line.73"></a> +<span class="sourceLineNo">074</span><a name="line.74"></a> +<span class="sourceLineNo">075</span> protected final ImplType implType;<a name="line.75"></a> +<span class="sourceLineNo">076</span> protected boolean specifyFramed;<a name="line.76"></a> +<span class="sourceLineNo">077</span> protected boolean specifyBindIP;<a name="line.77"></a> +<span class="sourceLineNo">078</span> protected boolean specifyCompact;<a name="line.78"></a> +<span class="sourceLineNo">079</span><a name="line.79"></a> +<span class="sourceLineNo">080</span> protected static final HBaseTestingUtility TEST_UTIL =<a name="line.80"></a> +<span class="sourceLineNo">081</span> new HBaseTestingUtility();<a name="line.81"></a> +<span class="sourceLineNo">082</span><a name="line.82"></a> +<span class="sourceLineNo">083</span> private Thread cmdLineThread;<a name="line.83"></a> +<span class="sourceLineNo">084</span> private volatile Exception cmdLineException;<a name="line.84"></a> +<span class="sourceLineNo">085</span><a name="line.85"></a> +<span class="sourceLineNo">086</span> private Exception clientSideException;<a name="line.86"></a> +<span class="sourceLineNo">087</span><a name="line.87"></a> +<span class="sourceLineNo">088</span> private volatile ThriftServer thriftServer;<a name="line.88"></a> +<span class="sourceLineNo">089</span> protected int port;<a name="line.89"></a> +<span class="sourceLineNo">090</span><a name="line.90"></a> +<span class="sourceLineNo">091</span> @Parameters<a name="line.91"></a> +<span class="sourceLineNo">092</span> public static Collection<Object[]> getParameters() {<a name="line.92"></a> +<span class="sourceLineNo">093</span> Collection<Object[]> parameters = new ArrayList<>();<a name="line.93"></a> +<span class="sourceLineNo">094</span> for (ImplType implType : ImplType.values()) {<a name="line.94"></a> +<span class="sourceLineNo">095</span> for (boolean specifyFramed : new boolean[] {false, true}) {<a name="line.95"></a> +<span class="sourceLineNo">096</span> for (boolean specifyBindIP : new boolean[] {false, true}) {<a name="line.96"></a> +<span class="sourceLineNo">097</span> if (specifyBindIP && !implType.canSpecifyBindIP) {<a name="line.97"></a> +<span class="sourceLineNo">098</span> continue;<a name="line.98"></a> +<span class="sourceLineNo">099</span> }<a name="line.99"></a> +<span class="sourceLineNo">100</span> for (boolean specifyCompact : new boolean[] {false, true}) {<a name="line.100"></a> +<span class="sourceLineNo">101</span> parameters.add(new Object[] {<a name="line.101"></a> +<span class="sourceLineNo">102</span> implType, specifyFramed, specifyBindIP, specifyCompact<a name="line.102"></a> +<span class="sourceLineNo">103</span> });<a name="line.103"></a> +<span class="sourceLineNo">104</span> }<a name="line.104"></a> +<span class="sourceLineNo">105</span> }<a name="line.105"></a> +<span class="sourceLineNo">106</span> }<a name="line.106"></a> +<span class="sourceLineNo">107</span> }<a name="line.107"></a> +<span class="sourceLineNo">108</span> return parameters;<a name="line.108"></a> +<span class="sourceLineNo">109</span> }<a name="line.109"></a> +<span class="sourceLineNo">110</span><a name="line.110"></a> +<span class="sourceLineNo">111</span> public TestThriftServerCmdLine(ImplType implType, boolean specifyFramed,<a name="line.111"></a> +<span class="sourceLineNo">112</span> boolean specifyBindIP, boolean specifyCompact) {<a name="line.112"></a> +<span class="sourceLineNo">113</span> this.implType = implType;<a name="line.113"></a> +<span class="sourceLineNo">114</span> this.specifyFramed = specifyFramed;<a name="line.114"></a> +<span class="sourceLineNo">115</span> this.specifyBindIP = specifyBindIP;<a name="line.115"></a> +<span class="sourceLineNo">116</span> this.specifyCompact = specifyCompact;<a name="line.116"></a> +<span class="sourceLineNo">117</span> LOG.debug(getParametersString());<a name="line.117"></a> +<span class="sourceLineNo">118</span> }<a name="line.118"></a> +<span class="sourceLineNo">119</span><a name="line.119"></a> +<span class="sourceLineNo">120</span> private String getParametersString() {<a name="line.120"></a> +<span class="sourceLineNo">121</span> return "implType=" + implType + ", " +<a name="line.121"></a> +<span class="sourceLineNo">122</span> "specifyFramed=" + specifyFramed + ", " +<a name="line.122"></a> +<span class="sourceLineNo">123</span> "specifyBindIP=" + specifyBindIP + ", " +<a name="line.123"></a> +<span class="sourceLineNo">124</span> "specifyCompact=" + specifyCompact;<a name="line.124"></a> +<span class="sourceLineNo">125</span> }<a name="line.125"></a> +<span class="sourceLineNo">126</span><a name="line.126"></a> +<span class="sourceLineNo">127</span> @BeforeClass<a name="line.127"></a> +<span class="sourceLineNo">128</span> public static void setUpBeforeClass() throws Exception {<a name="line.128"></a> +<span class="sourceLineNo">129</span> TEST_UTIL.getConfiguration().setBoolean("hbase.table.sanity.checks", false);<a name="line.129"></a> +<span class="sourceLineNo">130</span> TEST_UTIL.startMiniCluster();<a name="line.130"></a> +<span class="sourceLineNo">131</span> //ensure that server time increments every time we do an operation, otherwise<a name="line.131"></a> +<span class="sourceLineNo">132</span> //successive puts having the same timestamp will override each other<a name="line.132"></a> +<span class="sourceLineNo">133</span> EnvironmentEdgeManagerTestHelper.injectEdge(new IncrementingEnvironmentEdge());<a name="line.133"></a> +<span class="sourceLineNo">134</span> }<a name="line.134"></a> +<span class="sourceLineNo">135</span><a name="line.135"></a> +<span class="sourceLineNo">136</span> @AfterClass<a name="line.136"></a> +<span class="sourceLineNo">137</span> public static void tearDownAfterClass() throws Exception {<a name="line.137"></a> +<span class="sourceLineNo">138</span> TEST_UTIL.shutdownMiniCluster();<a name="line.138"></a> +<span class="sourceLineNo">139</span> EnvironmentEdgeManager.reset();<a name="line.139"></a> +<span class="sourceLineNo">140</span> }<a name="line.140"></a> +<span class="sourceLineNo">141</span><a name="line.141"></a> +<span class="sourceLineNo">142</span> private void startCmdLineThread(final String[] args) {<a name="line.142"></a> +<span class="sourceLineNo">143</span> LOG.info("Starting HBase Thrift server with command line: " + Joiner.on(" ").join(args));<a name="line.143"></a> +<span class="sourceLineNo">144</span><a name="line.144"></a> +<span class="sourceLineNo">145</span> cmdLineException = null;<a name="line.145"></a> +<span class="sourceLineNo">146</span> cmdLineThread = new Thread(new Runnable() {<a name="line.146"></a> +<span class="sourceLineNo">147</span> @Override<a name="line.147"></a> +<span class="sourceLineNo">148</span> public void run() {<a name="line.148"></a> +<span class="sourceLineNo">149</span> try {<a name="line.149"></a> +<span class="sourceLineNo">150</span> thriftServer.run(args);<a name="line.150"></a> +<span class="sourceLineNo">151</span> } catch (Exception e) {<a name="line.151"></a> +<span class="sourceLineNo">152</span> LOG.error("Error when start thrift server", e);<a name="line.152"></a> +<span class="sourceLineNo">153</span> cmdLineException = e;<a name="line.153"></a> +<span class="sourceLineNo">154</span> }<a name="line.154"></a> +<span class="sourceLineNo">155</span> }<a name="line.155"></a> +<span class="sourceLineNo">156</span> });<a name="line.156"></a> +<span class="sourceLineNo">157</span> cmdLineThread.setName(ThriftServer.class.getSimpleName() +<a name="line.157"></a> +<span class="sourceLineNo">158</span> "-cmdline");<a name="line.158"></a> +<span class="sourceLineNo">159</span> cmdLineThread.start();<a name="line.159"></a> +<span class="sourceLineNo">160</span> }<a name="line.160"></a> +<span class="sourceLineNo">161</span><a name="line.161"></a> +<span class="sourceLineNo">162</span> protected ThriftServer createThriftServer() {<a name="line.162"></a> +<span class="sourceLineNo">163</span> return new ThriftServer(TEST_UTIL.getConfiguration());<a name="line.163"></a> +<span class="sourceLineNo">164</span> }<a name="line.164"></a> +<span class="sourceLineNo">165</span><a name="line.165"></a> +<span class="sourceLineNo">166</span> @Test<a name="line.166"></a> +<span class="sourceLineNo">167</span> public void testRunThriftServer() throws Exception {<a name="line.167"></a> +<span class="sourceLineNo">168</span> List<String> args = new ArrayList<>();<a name="line.168"></a> +<span class="sourceLineNo">169</span> if (implType != null) {<a name="line.169"></a> +<span class="sourceLineNo">170</span> String serverTypeOption = implType.toString();<a name="line.170"></a> +<span class="sourceLineNo">171</span> assertTrue(serverTypeOption.startsWith("-"));<a name="line.171"></a> +<span class="sourceLineNo">172</span> args.add(serverTypeOption);<a name="line.172"></a> +<span class="sourceLineNo">173</span> }<a name="line.173"></a> +<span class="sourceLineNo">174</span> port = HBaseTestingUtility.randomFreePort();<a name="line.174"></a> +<span class="sourceLineNo">175</span> args.add("-" + PORT_OPTION);<a name="line.175"></a> +<span class="sourceLineNo">176</span> args.add(String.valueOf(port));<a name="line.176"></a> +<span class="sourceLineNo">177</span> args.add("-" + INFOPORT_OPTION);<a name="line.177"></a> +<span class="sourceLineNo">178</span> int infoPort = HBaseTestingUtility.randomFreePort();<a name="line.178"></a> +<span class="sourceLineNo">179</span> args.add(String.valueOf(infoPort));<a name="line.179"></a> +<span class="sourceLineNo">180</span><a name="line.180"></a> +<span class="sourceLineNo">181</span> if (specifyFramed) {<a name="line.181"></a> +<span class="sourceLineNo">182</span> args.add("-" + FRAMED_OPTION);<a name="line.182"></a> +<span class="sourceLineNo">183</span> }<a name="line.183"></a> +<span class="sourceLineNo">184</span> if (specifyBindIP) {<a name="line.184"></a> +<span class="sourceLineNo">185</span> args.add("-" + BIND_OPTION);<a name="line.185"></a> +<span class="sourceLineNo">186</span> args.add(InetAddress.getLocalHost().getHostName());<a name="line.186"></a> +<span class="sourceLineNo">187</span> }<a name="line.187"></a> +<span class="sourceLineNo">188</span> if (specifyCompact) {<a name="line.188"></a> +<span class="sourceLineNo">189</span> args.add("-" + COMPACT_OPTION);<a name="line.189"></a> +<span class="sourceLineNo">190</span> }<a name="line.190"></a> +<span class="sourceLineNo">191</span> args.add("start");<a name="line.191"></a> <span class="sourceLineNo">192</span><a name="line.192"></a> -<span class="sourceLineNo">193</span> Class<? extends TServer> expectedClass = implType != null ?<a name="line.193"></a> -<span class="sourceLineNo">194</span> implType.serverClass : TBoundedThreadPoolServer.class;<a name="line.194"></a> -<span class="sourceLineNo">195</span> assertEquals(expectedClass,<a name="line.195"></a> -<span class="sourceLineNo">196</span> thriftServer.serverRunner.tserver.getClass());<a name="line.196"></a> -<span class="sourceLineNo">197</span><a name="line.197"></a> -<span class="sourceLineNo">198</span> try {<a name="line.198"></a> -<span class="sourceLineNo">199</span> talkToThriftServer();<a name="line.199"></a> -<span class="sourceLineNo">200</span> } catch (Exception ex) {<a name="line.200"></a> -<span class="sourceLineNo">201</span> clientSideException = ex;<a name="line.201"></a> -<span class="sourceLineNo">202</span> } finally {<a name="line.202"></a> -<span class="sourceLineNo">203</span> stopCmdLineThread();<a name="line.203"></a> -<span class="sourceLineNo">204</span> }<a name="line.204"></a> -<span class="sourceLineNo">205</span><a name="line.205"></a> -<span class="sourceLineNo">206</span> if (clientSideException != null) {<a name="line.206"></a> -<span class="sourceLineNo">207</span> LOG.error("Thrift client threw an exception. Parameters:" +<a name="line.207"></a> -<span class="sourceLineNo">208</span> getParametersString(), clientSideException);<a name="line.208"></a> -<span class="sourceLineNo">209</span> throw new Exception(clientSideException);<a name="line.209"></a> -<span class="sourceLineNo">210</span> }<a name="line.210"></a> -<span class="sourceLineNo">211</span> }<a name="line.211"></a> -<span class="sourceLineNo">212</span><a name="line.212"></a> -<span class="sourceLineNo">213</span> private static volatile boolean tableCreated = false;<a name="line.213"></a> +<span class="sourceLineNo">193</span> thriftServer = createThriftServer();<a name="line.193"></a> +<span class="sourceLineNo">194</span> startCmdLineThread(args.toArray(new String[args.size()]));<a name="line.194"></a> +<span class="sourceLineNo">195</span><a name="line.195"></a> +<span class="sourceLineNo">196</span> // wait up to 10s for the server to start<a name="line.196"></a> +<span class="sourceLineNo">197</span> for (int i = 0; i < 100<a name="line.197"></a> +<span class="sourceLineNo">198</span> && (thriftServer.tserver == null); i++) {<a name="line.198"></a> +<span class="sourceLineNo">199</span> Thread.sleep(100);<a name="line.199"></a> +<span class="sourceLineNo">200</span> }<a name="line.200"></a> +<span class="sourceLineNo">201</span><a name="line.201"></a> +<span class="sourceLineNo">202</span> Class<? extends TServer> expectedClass = implType != null ?<a name="line.202"></a> +<span class="sourceLineNo">203</span> implType.serverClass : TBoundedThreadPoolServer.class;<a name="line.203"></a> +<span class="sourceLineNo">204</span> assertEquals(expectedClass,<a name="line.204"></a> +<span class="sourceLineNo">205</span> thriftServer.tserver.getClass());<a name="line.205"></a> +<span class="sourceLineNo">206</span><a name="line.206"></a> +<span class="sourceLineNo">207</span> try {<a name="line.207"></a> +<span class="sourceLineNo">208</span> talkToThriftServer();<a name="line.208"></a> +<span class="sourceLineNo">209</span> } catch (Exception ex) {<a name="line.209"></a> +<span class="sourceLineNo">210</span> clientSideException = ex;<a name="line.210"></a> +<span class="sourceLineNo">211</span> } finally {<a name="line.211"></a> +<span class="sourceLineNo">212</span> stopCmdLineThread();<a name="line.212"></a> +<span class="sourceLineNo">213</span> }<a name="line.213"></a> <span class="sourceLineNo">214</span><a name="line.214"></a> -<span class="sourceLineNo">215</span> private void talkToThriftServer() throws Exception {<a name="line.215"></a> -<span class="sourceLineNo">216</span> TSocket sock = new TSocket(InetAddress.getLocalHost().getHostName(),<a name="line.216"></a> -<span class="sourceLineNo">217</span> port);<a name="line.217"></a> -<span class="sourceLineNo">218</span> TTransport transport = sock;<a name="line.218"></a> -<span class="sourceLineNo">219</span> if (specifyFramed || implType.isAlwaysFramed) {<a name="line.219"></a> -<span class="sourceLineNo">220</span> transport = new TFramedTransport(transport);<a name="line.220"></a> -<span class="sourceLineNo">221</span> }<a name="line.221"></a> -<span class="sourceLineNo">222</span><a name="line.222"></a> -<span class="sourceLineNo">223</span> sock.open();<a name="line.223"></a> -<span class="sourceLineNo">224</span> try {<a name="line.224"></a> -<span class="sourceLineNo">225</span> TProtocol prot;<a name="line.225"></a> -<span class="sourceLineNo">226</span> if (specifyCompact) {<a name="line.226"></a> -<span class="sourceLineNo">227</span> prot = new TCompactProtocol(transport);<a name="line.227"></a> -<span class="sourceLineNo">228</span> } else {<a name="line.228"></a> -<span class="sourceLineNo">229</span> prot = new TBinaryProtocol(transport);<a name="line.229"></a> -<span class="sourceLineNo">230</span> }<a name="line.230"></a> -<span class="sourceLineNo">231</span> Hbase.Client client = new Hbase.Client(prot);<a name="line.231"></a> -<span class="sourceLineNo">232</span> if (!tableCreated){<a name="line.232"></a> -<span class="sourceLineNo">233</span> TestThriftServer.createTestTables(client);<a name="line.233"></a> -<span class="sourceLineNo">234</span> tableCreated = true;<a name="line.234"></a> -<span class="sourceLineNo">235</span> }<a name="line.235"></a> -<span class="sourceLineNo">236</span> TestThriftServer.checkTableList(client);<a name="line.236"></a> -<span class="sourceLineNo">237</span><a name="line.237"></a> -<span class="sourceLineNo">238</span> } finally {<a name="line.238"></a> -<span class="sourceLineNo">239</span> sock.close();<a name="line.239"></a> -<span class="sourceLineNo">240</span> }<a name="line.240"></a> -<span class="sourceLineNo">241</span> }<a name="line.241"></a> -<span class="sourceLineNo">242</span><a name="line.242"></a> -<span class="sourceLineNo">243</span> private void stopCmdLineThread() throws Exception {<a name="line.243"></a> -<span class="sourceLineNo">244</span> LOG.debug("Stopping " + implType.simpleClassName() + " Thrift server");<a name="line.244"></a> -<span class="sourceLineNo">245</span> thriftServer.stop();<a name="line.245"></a> -<span class="sourceLineNo">246</span> cmdLineThread.join();<a name="line.246"></a> -<span class="sourceLineNo">247</span> if (cmdLineException != null) {<a name="line.247"></a> -<span class="sourceLineNo">248</span> LOG.error("Command-line invocation of HBase Thrift server threw an " +<a name="line.248"></a> -<span class="sourceLineNo">249</span> "exception", cmdLineException);<a name="line.249"></a> -<span class="sourceLineNo">250</span> throw new Exception(cmdLineException);<a name="line.250"></a> -<span class="sourceLineNo">251</span> }<a name="line.251"></a> -<span class="sourceLineNo">252</span> }<a name="line.252"></a> -<span class="sourceLineNo">253</span>}<a name="line.253"></a> -<span class="sourceLineNo">254</span><a name="line.254"></a> +<span class="sourceLineNo">215</span> if (clientSideException != null) {<a name="line.215"></a> +<span class="sourceLineNo">216</span> LOG.error("Thrift client threw an exception. Parameters:" +<a name="line.216"></a> +<span class="sourceLineNo">217</span> getParametersString(), clientSideException);<a name="line.217"></a> +<span class="sourceLineNo">218</span> throw new Exception(clientSideException);<a name="line.218"></a> +<span class="sourceLineNo">219</span> }<a name="line.219"></a> +<span class="sourceLineNo">220</span> }<a name="line.220"></a> +<span class="sourceLineNo">221</span><a name="line.221"></a> +<span class="sourceLineNo">222</span> protected static volatile boolean tableCreated = false;<a name="line.222"></a> +<span class="sourceLineNo">223</span><a name="line.223"></a> +<span class="sourceLineNo">224</span> protected void talkToThriftServer() throws Exception {<a name="line.224"></a> +<span class="sourceLineNo">225</span> TSocket sock = new TSocket(InetAddress.getLocalHost().getHostName(),<a name="line.225"></a> +<span class="sourceLineNo">226</span> port);<a name="line.226"></a> +<span class="sourceLineNo">227</span> TTransport transport = sock;<a name="line.227"></a> +<span class="sourceLineNo">228</span> if (specifyFramed || implType.isAlwaysFramed) {<a name="line.228"></a> +<span class="sourceLineNo">229</span> transport = new TFramedTransport(transport);<a name="line.229"></a> +<span class="sourceLineNo">230</span> }<a name="line.230"></a> +<span class="sourceLineNo">231</span><a name="line.231"></a> +<span class="sourceLineNo">232</span> sock.open();<a name="line.232"></a> +<span class="sourceLineNo">233</span> try {<a name="line.233"></a> +<span class="sourceLineNo">234</span> TProtocol prot;<a name="line.234"></a> +<span class="sourceLineNo">235</span> if (specifyCompact) {<a name="line.235"></a> +<span class="sourceLineNo">236</span> prot = new TCompactProtocol(transport);<a name="line.236"></a> +<span class="sourceLineNo">237</span> } else {<a name="line.237"></a> +<span class="sourceLineNo">238</span> prot = new TBinaryProtocol(transport);<a name="line.238"></a> +<span class="sourceLineNo">239</span> }<a name="line.239"></a> +<span class="sourceLineNo">240</span><a name="line.240"></a> +<span class="sourceLineNo">241</span> Hbase.Client client = new Hbase.Client(prot);<a name="line.241"></a> +<span class="sourceLineNo">242</span> if (!tableCreated){<a name="line.242"></a> +<span class="sourceLineNo">243</span> TestThriftServer.createTestTables(client);<a name="line.243"></a> +<span class="sourceLineNo">244</span> tableCreated = true;<a name="line.244"></a> +<span class="sourceLineNo">245</span> }<a name="line.245"></a> +<span class="sourceLineNo">246</span> TestThriftServer.checkTableList(client);<a name="line.246"></a> +<span class="sourceLineNo">247</span><a name="line.247"></a> +<span class="sourceLineNo">248</span> } finally {<a name="line.248"></a> +<span class="sourceLineNo">249</span> sock.close();<a name="line.249"></a> +<span class="sourceLineNo">250</span> }<a name="line.250"></a> +<span class="sourceLineNo">251</span> }<a name="line.251"></a> +<span class="sourceLineNo">252</span><a name="line.252"></a> +<span class="sourceLineNo">253</span> private void stopCmdLineThread() throws Exception {<a name="line.253"></a> +<span class="sourceLineNo">254</span> LOG.debug("Stopping " + implType.simpleClassName() + " Thrift server");<a name="line.254"></a> +<span class="sourceLineNo">255</span> thriftServer.stop();<a name="line.255"></a> +<span class="sourceLineNo">256</span> cmdLineThread.join();<a name="line.256"></a> +<span class="sourceLineNo">257</span> if (cmdLineException != null) {<a name="line.257"></a> +<span class="sourceLineNo">258</span> LOG.error("Command-line invocation of HBase Thrift server threw an " +<a name="line.258"></a> +<span class="sourceLineNo">259</span> "exception", cmdLineException);<a name="line.259"></a> +<span class="sourceLineNo">260</span> throw new Exception(cmdLineException);<a name="line.260"></a> +<span class="sourceLineNo">261</span> }<a name="line.261"></a> +<span class="sourceLineNo">262</span> }<a name="line.262"></a> +<span class="sourceLineNo">263</span>}<a name="line.263"></a> +<span class="sourceLineNo">264</span><a name="line.264"></a>
