http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.SequentialReadTest.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.SequentialReadTest.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.SequentialReadTest.html index ee267a6..ff25d2f 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.SequentialReadTest.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.SequentialReadTest.html @@ -1202,7 +1202,7 @@ <span class="sourceLineNo">1194</span> for (int i = startRow; i < lastRow; i++) {<a name="line.1194"></a> <span class="sourceLineNo">1195</span> if (i % everyN != 0) continue;<a name="line.1195"></a> <span class="sourceLineNo">1196</span> long startTime = System.nanoTime();<a name="line.1196"></a> -<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row");){<a name="line.1197"></a> +<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row")){<a name="line.1197"></a> <span class="sourceLineNo">1198</span> testRow(i);<a name="line.1198"></a> <span class="sourceLineNo">1199</span> }<a name="line.1199"></a> <span class="sourceLineNo">1200</span> if ( (i - startRow) > opts.measureAfter) {<a name="line.1200"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.SequentialWriteTest.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.SequentialWriteTest.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.SequentialWriteTest.html index ee267a6..ff25d2f 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.SequentialWriteTest.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.SequentialWriteTest.html @@ -1202,7 +1202,7 @@ <span class="sourceLineNo">1194</span> for (int i = startRow; i < lastRow; i++) {<a name="line.1194"></a> <span class="sourceLineNo">1195</span> if (i % everyN != 0) continue;<a name="line.1195"></a> <span class="sourceLineNo">1196</span> long startTime = System.nanoTime();<a name="line.1196"></a> -<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row");){<a name="line.1197"></a> +<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row")){<a name="line.1197"></a> <span class="sourceLineNo">1198</span> testRow(i);<a name="line.1198"></a> <span class="sourceLineNo">1199</span> }<a name="line.1199"></a> <span class="sourceLineNo">1200</span> if ( (i - startRow) > opts.measureAfter) {<a name="line.1200"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Status.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Status.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Status.html index ee267a6..ff25d2f 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Status.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Status.html @@ -1202,7 +1202,7 @@ <span class="sourceLineNo">1194</span> for (int i = startRow; i < lastRow; i++) {<a name="line.1194"></a> <span class="sourceLineNo">1195</span> if (i % everyN != 0) continue;<a name="line.1195"></a> <span class="sourceLineNo">1196</span> long startTime = System.nanoTime();<a name="line.1196"></a> -<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row");){<a name="line.1197"></a> +<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row")){<a name="line.1197"></a> <span class="sourceLineNo">1198</span> testRow(i);<a name="line.1198"></a> <span class="sourceLineNo">1199</span> }<a name="line.1199"></a> <span class="sourceLineNo">1200</span> if ( (i - startRow) > opts.measureAfter) {<a name="line.1200"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TableTest.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TableTest.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TableTest.html index ee267a6..ff25d2f 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TableTest.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TableTest.html @@ -1202,7 +1202,7 @@ <span class="sourceLineNo">1194</span> for (int i = startRow; i < lastRow; i++) {<a name="line.1194"></a> <span class="sourceLineNo">1195</span> if (i % everyN != 0) continue;<a name="line.1195"></a> <span class="sourceLineNo">1196</span> long startTime = System.nanoTime();<a name="line.1196"></a> -<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row");){<a name="line.1197"></a> +<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row")){<a name="line.1197"></a> <span class="sourceLineNo">1198</span> testRow(i);<a name="line.1198"></a> <span class="sourceLineNo">1199</span> }<a name="line.1199"></a> <span class="sourceLineNo">1200</span> if ( (i - startRow) > opts.measureAfter) {<a name="line.1200"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Test.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Test.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Test.html index ee267a6..ff25d2f 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Test.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.Test.html @@ -1202,7 +1202,7 @@ <span class="sourceLineNo">1194</span> for (int i = startRow; i < lastRow; i++) {<a name="line.1194"></a> <span class="sourceLineNo">1195</span> if (i % everyN != 0) continue;<a name="line.1195"></a> <span class="sourceLineNo">1196</span> long startTime = System.nanoTime();<a name="line.1196"></a> -<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row");){<a name="line.1197"></a> +<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row")){<a name="line.1197"></a> <span class="sourceLineNo">1198</span> testRow(i);<a name="line.1198"></a> <span class="sourceLineNo">1199</span> }<a name="line.1199"></a> <span class="sourceLineNo">1200</span> if ( (i - startRow) > opts.measureAfter) {<a name="line.1200"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestBase.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestBase.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestBase.html index ee267a6..ff25d2f 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestBase.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestBase.html @@ -1202,7 +1202,7 @@ <span class="sourceLineNo">1194</span> for (int i = startRow; i < lastRow; i++) {<a name="line.1194"></a> <span class="sourceLineNo">1195</span> if (i % everyN != 0) continue;<a name="line.1195"></a> <span class="sourceLineNo">1196</span> long startTime = System.nanoTime();<a name="line.1196"></a> -<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row");){<a name="line.1197"></a> +<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row")){<a name="line.1197"></a> <span class="sourceLineNo">1198</span> testRow(i);<a name="line.1198"></a> <span class="sourceLineNo">1199</span> }<a name="line.1199"></a> <span class="sourceLineNo">1200</span> if ( (i - startRow) > opts.measureAfter) {<a name="line.1200"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestOptions.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestOptions.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestOptions.html index ee267a6..ff25d2f 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestOptions.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.TestOptions.html @@ -1202,7 +1202,7 @@ <span class="sourceLineNo">1194</span> for (int i = startRow; i < lastRow; i++) {<a name="line.1194"></a> <span class="sourceLineNo">1195</span> if (i % everyN != 0) continue;<a name="line.1195"></a> <span class="sourceLineNo">1196</span> long startTime = System.nanoTime();<a name="line.1196"></a> -<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row");){<a name="line.1197"></a> +<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row")){<a name="line.1197"></a> <span class="sourceLineNo">1198</span> testRow(i);<a name="line.1198"></a> <span class="sourceLineNo">1199</span> }<a name="line.1199"></a> <span class="sourceLineNo">1200</span> if ( (i - startRow) > opts.measureAfter) {<a name="line.1200"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.html index ee267a6..ff25d2f 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/PerformanceEvaluation.html @@ -1202,7 +1202,7 @@ <span class="sourceLineNo">1194</span> for (int i = startRow; i < lastRow; i++) {<a name="line.1194"></a> <span class="sourceLineNo">1195</span> if (i % everyN != 0) continue;<a name="line.1195"></a> <span class="sourceLineNo">1196</span> long startTime = System.nanoTime();<a name="line.1196"></a> -<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row");){<a name="line.1197"></a> +<span class="sourceLineNo">1197</span> try (TraceScope scope = TraceUtil.createTrace("test row")){<a name="line.1197"></a> <span class="sourceLineNo">1198</span> testRow(i);<a name="line.1198"></a> <span class="sourceLineNo">1199</span> }<a name="line.1199"></a> <span class="sourceLineNo">1200</span> if ( (i - startRow) > opts.measureAfter) {<a name="line.1200"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.SeqShardedDataGenerator.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.SeqShardedDataGenerator.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.SeqShardedDataGenerator.html index 4385a40..517c288 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.SeqShardedDataGenerator.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.SeqShardedDataGenerator.html @@ -354,7 +354,7 @@ <span class="sourceLineNo">346</span> public boolean verify(byte[] rowKey, byte[] cf, Set<byte[]> columnSet) {<a name="line.346"></a> <span class="sourceLineNo">347</span> return true;<a name="line.347"></a> <span class="sourceLineNo">348</span> }<a name="line.348"></a> -<span class="sourceLineNo">349</span> };<a name="line.349"></a> +<span class="sourceLineNo">349</span> }<a name="line.349"></a> <span class="sourceLineNo">350</span>}<a name="line.350"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.html index 4385a40..517c288 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.html @@ -354,7 +354,7 @@ <span class="sourceLineNo">346</span> public boolean verify(byte[] rowKey, byte[] cf, Set<byte[]> columnSet) {<a name="line.346"></a> <span class="sourceLineNo">347</span> return true;<a name="line.347"></a> <span class="sourceLineNo">348</span> }<a name="line.348"></a> -<span class="sourceLineNo">349</span> };<a name="line.349"></a> +<span class="sourceLineNo">349</span> }<a name="line.349"></a> <span class="sourceLineNo">350</span>}<a name="line.350"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.NonExtendedCell.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.NonExtendedCell.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.NonExtendedCell.html index 17e4924..29440fd 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.NonExtendedCell.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.NonExtendedCell.html @@ -62,7 +62,7 @@ <span class="sourceLineNo">054</span> public CellScanner cellScanner() {<a name="line.54"></a> <span class="sourceLineNo">055</span> return new TestCellScanner(this.cellsCount);<a name="line.55"></a> <span class="sourceLineNo">056</span> }<a name="line.56"></a> -<span class="sourceLineNo">057</span> };<a name="line.57"></a> +<span class="sourceLineNo">057</span> }<a name="line.57"></a> <span class="sourceLineNo">058</span><a name="line.58"></a> <span class="sourceLineNo">059</span> /**<a name="line.59"></a> <span class="sourceLineNo">060</span> * CellScanner used in test.<a name="line.60"></a> @@ -211,7 +211,7 @@ <span class="sourceLineNo">203</span> public DataType getType() {<a name="line.203"></a> <span class="sourceLineNo">204</span> return PrivateCellUtil.toDataType(getTypeByte());<a name="line.204"></a> <span class="sourceLineNo">205</span> }<a name="line.205"></a> -<span class="sourceLineNo">206</span> };<a name="line.206"></a> +<span class="sourceLineNo">206</span> }<a name="line.206"></a> <span class="sourceLineNo">207</span><a name="line.207"></a> <span class="sourceLineNo">208</span> /**<a name="line.208"></a> <span class="sourceLineNo">209</span> * Was overflowing if 100k or so lists of cellscanners to return.<a name="line.209"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCell.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCell.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCell.html index 17e4924..29440fd 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCell.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCell.html @@ -62,7 +62,7 @@ <span class="sourceLineNo">054</span> public CellScanner cellScanner() {<a name="line.54"></a> <span class="sourceLineNo">055</span> return new TestCellScanner(this.cellsCount);<a name="line.55"></a> <span class="sourceLineNo">056</span> }<a name="line.56"></a> -<span class="sourceLineNo">057</span> };<a name="line.57"></a> +<span class="sourceLineNo">057</span> }<a name="line.57"></a> <span class="sourceLineNo">058</span><a name="line.58"></a> <span class="sourceLineNo">059</span> /**<a name="line.59"></a> <span class="sourceLineNo">060</span> * CellScanner used in test.<a name="line.60"></a> @@ -211,7 +211,7 @@ <span class="sourceLineNo">203</span> public DataType getType() {<a name="line.203"></a> <span class="sourceLineNo">204</span> return PrivateCellUtil.toDataType(getTypeByte());<a name="line.204"></a> <span class="sourceLineNo">205</span> }<a name="line.205"></a> -<span class="sourceLineNo">206</span> };<a name="line.206"></a> +<span class="sourceLineNo">206</span> }<a name="line.206"></a> <span class="sourceLineNo">207</span><a name="line.207"></a> <span class="sourceLineNo">208</span> /**<a name="line.208"></a> <span class="sourceLineNo">209</span> * Was overflowing if 100k or so lists of cellscanners to return.<a name="line.209"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCellScannable.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCellScannable.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCellScannable.html index 17e4924..29440fd 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCellScannable.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCellScannable.html @@ -62,7 +62,7 @@ <span class="sourceLineNo">054</span> public CellScanner cellScanner() {<a name="line.54"></a> <span class="sourceLineNo">055</span> return new TestCellScanner(this.cellsCount);<a name="line.55"></a> <span class="sourceLineNo">056</span> }<a name="line.56"></a> -<span class="sourceLineNo">057</span> };<a name="line.57"></a> +<span class="sourceLineNo">057</span> }<a name="line.57"></a> <span class="sourceLineNo">058</span><a name="line.58"></a> <span class="sourceLineNo">059</span> /**<a name="line.59"></a> <span class="sourceLineNo">060</span> * CellScanner used in test.<a name="line.60"></a> @@ -211,7 +211,7 @@ <span class="sourceLineNo">203</span> public DataType getType() {<a name="line.203"></a> <span class="sourceLineNo">204</span> return PrivateCellUtil.toDataType(getTypeByte());<a name="line.204"></a> <span class="sourceLineNo">205</span> }<a name="line.205"></a> -<span class="sourceLineNo">206</span> };<a name="line.206"></a> +<span class="sourceLineNo">206</span> }<a name="line.206"></a> <span class="sourceLineNo">207</span><a name="line.207"></a> <span class="sourceLineNo">208</span> /**<a name="line.208"></a> <span class="sourceLineNo">209</span> * Was overflowing if 100k or so lists of cellscanners to return.<a name="line.209"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCellScanner.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCellScanner.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCellScanner.html index 17e4924..29440fd 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCellScanner.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.TestCellScanner.html @@ -62,7 +62,7 @@ <span class="sourceLineNo">054</span> public CellScanner cellScanner() {<a name="line.54"></a> <span class="sourceLineNo">055</span> return new TestCellScanner(this.cellsCount);<a name="line.55"></a> <span class="sourceLineNo">056</span> }<a name="line.56"></a> -<span class="sourceLineNo">057</span> };<a name="line.57"></a> +<span class="sourceLineNo">057</span> }<a name="line.57"></a> <span class="sourceLineNo">058</span><a name="line.58"></a> <span class="sourceLineNo">059</span> /**<a name="line.59"></a> <span class="sourceLineNo">060</span> * CellScanner used in test.<a name="line.60"></a> @@ -211,7 +211,7 @@ <span class="sourceLineNo">203</span> public DataType getType() {<a name="line.203"></a> <span class="sourceLineNo">204</span> return PrivateCellUtil.toDataType(getTypeByte());<a name="line.204"></a> <span class="sourceLineNo">205</span> }<a name="line.205"></a> -<span class="sourceLineNo">206</span> };<a name="line.206"></a> +<span class="sourceLineNo">206</span> }<a name="line.206"></a> <span class="sourceLineNo">207</span><a name="line.207"></a> <span class="sourceLineNo">208</span> /**<a name="line.208"></a> <span class="sourceLineNo">209</span> * Was overflowing if 100k or so lists of cellscanners to return.<a name="line.209"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.html index 17e4924..29440fd 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestCellUtil.html @@ -62,7 +62,7 @@ <span class="sourceLineNo">054</span> public CellScanner cellScanner() {<a name="line.54"></a> <span class="sourceLineNo">055</span> return new TestCellScanner(this.cellsCount);<a name="line.55"></a> <span class="sourceLineNo">056</span> }<a name="line.56"></a> -<span class="sourceLineNo">057</span> };<a name="line.57"></a> +<span class="sourceLineNo">057</span> }<a name="line.57"></a> <span class="sourceLineNo">058</span><a name="line.58"></a> <span class="sourceLineNo">059</span> /**<a name="line.59"></a> <span class="sourceLineNo">060</span> * CellScanner used in test.<a name="line.60"></a> @@ -211,7 +211,7 @@ <span class="sourceLineNo">203</span> public DataType getType() {<a name="line.203"></a> <span class="sourceLineNo">204</span> return PrivateCellUtil.toDataType(getTypeByte());<a name="line.204"></a> <span class="sourceLineNo">205</span> }<a name="line.205"></a> -<span class="sourceLineNo">206</span> };<a name="line.206"></a> +<span class="sourceLineNo">206</span> }<a name="line.206"></a> <span class="sourceLineNo">207</span><a name="line.207"></a> <span class="sourceLineNo">208</span> /**<a name="line.208"></a> <span class="sourceLineNo">209</span> * Was overflowing if 100k or so lists of cellscanners to return.<a name="line.209"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClassFinder.FileAndPath.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClassFinder.FileAndPath.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClassFinder.FileAndPath.html index 8e1facf..97299b4 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClassFinder.FileAndPath.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClassFinder.FileAndPath.html @@ -427,7 +427,7 @@ <span class="sourceLineNo">419</span> method.invoke(urlClassLoader, new Object[] { jarFile.toURI().toURL() });<a name="line.419"></a> <span class="sourceLineNo">420</span> return jarFile.getAbsolutePath();<a name="line.420"></a> <span class="sourceLineNo">421</span> }<a name="line.421"></a> -<span class="sourceLineNo">422</span>};<a name="line.422"></a> +<span class="sourceLineNo">422</span>}<a name="line.422"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClassFinder.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClassFinder.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClassFinder.html index 8e1facf..97299b4 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClassFinder.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClassFinder.html @@ -427,7 +427,7 @@ <span class="sourceLineNo">419</span> method.invoke(urlClassLoader, new Object[] { jarFile.toURI().toURL() });<a name="line.419"></a> <span class="sourceLineNo">420</span> return jarFile.getAbsolutePath();<a name="line.420"></a> <span class="sourceLineNo">421</span> }<a name="line.421"></a> -<span class="sourceLineNo">422</span>};<a name="line.422"></a> +<span class="sourceLineNo">422</span>}<a name="line.422"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.FullTableBackupClientForTest.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.FullTableBackupClientForTest.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.FullTableBackupClientForTest.html index 4c6fde8..b3081c8 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.FullTableBackupClientForTest.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.FullTableBackupClientForTest.html @@ -202,7 +202,7 @@ <span class="sourceLineNo">194</span> public void execute() throws IOException<a name="line.194"></a> <span class="sourceLineNo">195</span> {<a name="line.195"></a> <span class="sourceLineNo">196</span> // Get the stage ID to fail on<a name="line.196"></a> -<span class="sourceLineNo">197</span> try (Admin admin = conn.getAdmin();) {<a name="line.197"></a> +<span class="sourceLineNo">197</span> try (Admin admin = conn.getAdmin()) {<a name="line.197"></a> <span class="sourceLineNo">198</span> // Begin BACKUP<a name="line.198"></a> <span class="sourceLineNo">199</span> beginBackup(backupManager, backupInfo);<a name="line.199"></a> <span class="sourceLineNo">200</span> failStageIf(Stage.stage_0);<a name="line.200"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.IncrementalTableBackupClientForTest.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.IncrementalTableBackupClientForTest.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.IncrementalTableBackupClientForTest.html index 4c6fde8..b3081c8 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.IncrementalTableBackupClientForTest.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.IncrementalTableBackupClientForTest.html @@ -202,7 +202,7 @@ <span class="sourceLineNo">194</span> public void execute() throws IOException<a name="line.194"></a> <span class="sourceLineNo">195</span> {<a name="line.195"></a> <span class="sourceLineNo">196</span> // Get the stage ID to fail on<a name="line.196"></a> -<span class="sourceLineNo">197</span> try (Admin admin = conn.getAdmin();) {<a name="line.197"></a> +<span class="sourceLineNo">197</span> try (Admin admin = conn.getAdmin()) {<a name="line.197"></a> <span class="sourceLineNo">198</span> // Begin BACKUP<a name="line.198"></a> <span class="sourceLineNo">199</span> beginBackup(backupManager, backupInfo);<a name="line.199"></a> <span class="sourceLineNo">200</span> failStageIf(Stage.stage_0);<a name="line.200"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.html index 4c6fde8..b3081c8 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupBase.html @@ -202,7 +202,7 @@ <span class="sourceLineNo">194</span> public void execute() throws IOException<a name="line.194"></a> <span class="sourceLineNo">195</span> {<a name="line.195"></a> <span class="sourceLineNo">196</span> // Get the stage ID to fail on<a name="line.196"></a> -<span class="sourceLineNo">197</span> try (Admin admin = conn.getAdmin();) {<a name="line.197"></a> +<span class="sourceLineNo">197</span> try (Admin admin = conn.getAdmin()) {<a name="line.197"></a> <span class="sourceLineNo">198</span> // Begin BACKUP<a name="line.198"></a> <span class="sourceLineNo">199</span> beginBackup(backupManager, backupInfo);<a name="line.199"></a> <span class="sourceLineNo">200</span> failStageIf(Stage.stage_0);<a name="line.200"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.html index 221e938..8b24c84 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.html @@ -59,7 +59,7 @@ <span class="sourceLineNo">051</span> int numRows = TEST_UTIL.countRows(table1);<a name="line.51"></a> <span class="sourceLineNo">052</span> HBaseAdmin hba = TEST_UTIL.getHBaseAdmin();<a name="line.52"></a> <span class="sourceLineNo">053</span> // delete row<a name="line.53"></a> -<span class="sourceLineNo">054</span> try (Table table = TEST_UTIL.getConnection().getTable(table1);) {<a name="line.54"></a> +<span class="sourceLineNo">054</span> try (Table table = TEST_UTIL.getConnection().getTable(table1)) {<a name="line.54"></a> <span class="sourceLineNo">055</span> Delete delete = new Delete("row0".getBytes());<a name="line.55"></a> <span class="sourceLineNo">056</span> table.delete(delete);<a name="line.56"></a> <span class="sourceLineNo">057</span> hba.flush(table1);<a name="line.57"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures.html index dbfd2da..cd31633 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures.html @@ -275,73 +275,72 @@ <span class="sourceLineNo">267</span><a name="line.267"></a> <span class="sourceLineNo">268</span> conf.set(FAILURE_PHASE_KEY, phase.toString());<a name="line.268"></a> <span class="sourceLineNo">269</span><a name="line.269"></a> -<span class="sourceLineNo">270</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn);)<a name="line.270"></a> -<span class="sourceLineNo">271</span> {<a name="line.271"></a> -<span class="sourceLineNo">272</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.272"></a> -<span class="sourceLineNo">273</span> bAdmin.mergeBackups(backups);<a name="line.273"></a> -<span class="sourceLineNo">274</span> Assert.fail("Expected IOException");<a name="line.274"></a> -<span class="sourceLineNo">275</span> } catch (IOException e) {<a name="line.275"></a> -<span class="sourceLineNo">276</span> BackupSystemTable table = new BackupSystemTable(conn);<a name="line.276"></a> -<span class="sourceLineNo">277</span> if(phase.ordinal() < FailurePhase.PHASE4.ordinal()) {<a name="line.277"></a> -<span class="sourceLineNo">278</span> // No need to repair:<a name="line.278"></a> -<span class="sourceLineNo">279</span> // Both Merge and backup exclusive operations are finished<a name="line.279"></a> -<span class="sourceLineNo">280</span> assertFalse(table.isMergeInProgress());<a name="line.280"></a> -<span class="sourceLineNo">281</span> try {<a name="line.281"></a> -<span class="sourceLineNo">282</span> table.finishBackupExclusiveOperation();<a name="line.282"></a> -<span class="sourceLineNo">283</span> Assert.fail("IOException is expected");<a name="line.283"></a> -<span class="sourceLineNo">284</span> } catch(IOException ee) {<a name="line.284"></a> -<span class="sourceLineNo">285</span> // Expected<a name="line.285"></a> -<span class="sourceLineNo">286</span> }<a name="line.286"></a> -<span class="sourceLineNo">287</span> } else {<a name="line.287"></a> -<span class="sourceLineNo">288</span> // Repair is required<a name="line.288"></a> -<span class="sourceLineNo">289</span> assertTrue(table.isMergeInProgress());<a name="line.289"></a> -<span class="sourceLineNo">290</span> try {<a name="line.290"></a> -<span class="sourceLineNo">291</span> table.startBackupExclusiveOperation();<a name="line.291"></a> -<span class="sourceLineNo">292</span> Assert.fail("IOException is expected");<a name="line.292"></a> -<span class="sourceLineNo">293</span> } catch(IOException ee) {<a name="line.293"></a> -<span class="sourceLineNo">294</span> // Expected - clean up before proceeding<a name="line.294"></a> -<span class="sourceLineNo">295</span> table.finishMergeOperation();<a name="line.295"></a> -<span class="sourceLineNo">296</span> table.finishBackupExclusiveOperation();<a name="line.296"></a> -<span class="sourceLineNo">297</span> }<a name="line.297"></a> -<span class="sourceLineNo">298</span> }<a name="line.298"></a> -<span class="sourceLineNo">299</span> table.close();<a name="line.299"></a> -<span class="sourceLineNo">300</span> LOG.debug("Expected :"+ e.getMessage());<a name="line.300"></a> -<span class="sourceLineNo">301</span> }<a name="line.301"></a> -<span class="sourceLineNo">302</span> }<a name="line.302"></a> -<span class="sourceLineNo">303</span><a name="line.303"></a> -<span class="sourceLineNo">304</span> // Now merge w/o failures<a name="line.304"></a> -<span class="sourceLineNo">305</span> Configuration conf = conn.getConfiguration();<a name="line.305"></a> -<span class="sourceLineNo">306</span> conf.unset(FAILURE_PHASE_KEY);<a name="line.306"></a> -<span class="sourceLineNo">307</span> conf.unset(BackupRestoreFactory.HBASE_BACKUP_MERGE_IMPL_CLASS);<a name="line.307"></a> -<span class="sourceLineNo">308</span><a name="line.308"></a> -<span class="sourceLineNo">309</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn);) {<a name="line.309"></a> -<span class="sourceLineNo">310</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.310"></a> -<span class="sourceLineNo">311</span> bAdmin.mergeBackups(backups);<a name="line.311"></a> -<span class="sourceLineNo">312</span> }<a name="line.312"></a> -<span class="sourceLineNo">313</span><a name="line.313"></a> -<span class="sourceLineNo">314</span> // #6 - restore incremental backup for multiple tables, with overwrite<a name="line.314"></a> -<span class="sourceLineNo">315</span> TableName[] tablesRestoreIncMultiple = new TableName[] { table1, table2 };<a name="line.315"></a> -<span class="sourceLineNo">316</span> TableName[] tablesMapIncMultiple = new TableName[] { table1_restore, table2_restore };<a name="line.316"></a> -<span class="sourceLineNo">317</span> client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, backupIdIncMultiple2, false,<a name="line.317"></a> -<span class="sourceLineNo">318</span> tablesRestoreIncMultiple, tablesMapIncMultiple, true));<a name="line.318"></a> -<span class="sourceLineNo">319</span><a name="line.319"></a> -<span class="sourceLineNo">320</span> Table hTable = conn.getTable(table1_restore);<a name="line.320"></a> -<span class="sourceLineNo">321</span> LOG.debug("After incremental restore: " + hTable.getTableDescriptor());<a name="line.321"></a> -<span class="sourceLineNo">322</span> LOG.debug("f1 has " + TEST_UTIL.countRows(hTable, famName) + " rows");<a name="line.322"></a> -<span class="sourceLineNo">323</span> Assert.assertEquals(TEST_UTIL.countRows(hTable, famName), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.323"></a> -<span class="sourceLineNo">324</span><a name="line.324"></a> -<span class="sourceLineNo">325</span> hTable.close();<a name="line.325"></a> -<span class="sourceLineNo">326</span><a name="line.326"></a> -<span class="sourceLineNo">327</span> hTable = conn.getTable(table2_restore);<a name="line.327"></a> -<span class="sourceLineNo">328</span> Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.328"></a> -<span class="sourceLineNo">329</span> hTable.close();<a name="line.329"></a> -<span class="sourceLineNo">330</span><a name="line.330"></a> -<span class="sourceLineNo">331</span> admin.close();<a name="line.331"></a> -<span class="sourceLineNo">332</span> conn.close();<a name="line.332"></a> -<span class="sourceLineNo">333</span><a name="line.333"></a> -<span class="sourceLineNo">334</span> }<a name="line.334"></a> -<span class="sourceLineNo">335</span><a name="line.335"></a> -<span class="sourceLineNo">336</span>}<a name="line.336"></a> +<span class="sourceLineNo">270</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn)) {<a name="line.270"></a> +<span class="sourceLineNo">271</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.271"></a> +<span class="sourceLineNo">272</span> bAdmin.mergeBackups(backups);<a name="line.272"></a> +<span class="sourceLineNo">273</span> Assert.fail("Expected IOException");<a name="line.273"></a> +<span class="sourceLineNo">274</span> } catch (IOException e) {<a name="line.274"></a> +<span class="sourceLineNo">275</span> BackupSystemTable table = new BackupSystemTable(conn);<a name="line.275"></a> +<span class="sourceLineNo">276</span> if(phase.ordinal() < FailurePhase.PHASE4.ordinal()) {<a name="line.276"></a> +<span class="sourceLineNo">277</span> // No need to repair:<a name="line.277"></a> +<span class="sourceLineNo">278</span> // Both Merge and backup exclusive operations are finished<a name="line.278"></a> +<span class="sourceLineNo">279</span> assertFalse(table.isMergeInProgress());<a name="line.279"></a> +<span class="sourceLineNo">280</span> try {<a name="line.280"></a> +<span class="sourceLineNo">281</span> table.finishBackupExclusiveOperation();<a name="line.281"></a> +<span class="sourceLineNo">282</span> Assert.fail("IOException is expected");<a name="line.282"></a> +<span class="sourceLineNo">283</span> } catch(IOException ee) {<a name="line.283"></a> +<span class="sourceLineNo">284</span> // Expected<a name="line.284"></a> +<span class="sourceLineNo">285</span> }<a name="line.285"></a> +<span class="sourceLineNo">286</span> } else {<a name="line.286"></a> +<span class="sourceLineNo">287</span> // Repair is required<a name="line.287"></a> +<span class="sourceLineNo">288</span> assertTrue(table.isMergeInProgress());<a name="line.288"></a> +<span class="sourceLineNo">289</span> try {<a name="line.289"></a> +<span class="sourceLineNo">290</span> table.startBackupExclusiveOperation();<a name="line.290"></a> +<span class="sourceLineNo">291</span> Assert.fail("IOException is expected");<a name="line.291"></a> +<span class="sourceLineNo">292</span> } catch(IOException ee) {<a name="line.292"></a> +<span class="sourceLineNo">293</span> // Expected - clean up before proceeding<a name="line.293"></a> +<span class="sourceLineNo">294</span> table.finishMergeOperation();<a name="line.294"></a> +<span class="sourceLineNo">295</span> table.finishBackupExclusiveOperation();<a name="line.295"></a> +<span class="sourceLineNo">296</span> }<a name="line.296"></a> +<span class="sourceLineNo">297</span> }<a name="line.297"></a> +<span class="sourceLineNo">298</span> table.close();<a name="line.298"></a> +<span class="sourceLineNo">299</span> LOG.debug("Expected :"+ e.getMessage());<a name="line.299"></a> +<span class="sourceLineNo">300</span> }<a name="line.300"></a> +<span class="sourceLineNo">301</span> }<a name="line.301"></a> +<span class="sourceLineNo">302</span><a name="line.302"></a> +<span class="sourceLineNo">303</span> // Now merge w/o failures<a name="line.303"></a> +<span class="sourceLineNo">304</span> Configuration conf = conn.getConfiguration();<a name="line.304"></a> +<span class="sourceLineNo">305</span> conf.unset(FAILURE_PHASE_KEY);<a name="line.305"></a> +<span class="sourceLineNo">306</span> conf.unset(BackupRestoreFactory.HBASE_BACKUP_MERGE_IMPL_CLASS);<a name="line.306"></a> +<span class="sourceLineNo">307</span><a name="line.307"></a> +<span class="sourceLineNo">308</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn)) {<a name="line.308"></a> +<span class="sourceLineNo">309</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.309"></a> +<span class="sourceLineNo">310</span> bAdmin.mergeBackups(backups);<a name="line.310"></a> +<span class="sourceLineNo">311</span> }<a name="line.311"></a> +<span class="sourceLineNo">312</span><a name="line.312"></a> +<span class="sourceLineNo">313</span> // #6 - restore incremental backup for multiple tables, with overwrite<a name="line.313"></a> +<span class="sourceLineNo">314</span> TableName[] tablesRestoreIncMultiple = new TableName[] { table1, table2 };<a name="line.314"></a> +<span class="sourceLineNo">315</span> TableName[] tablesMapIncMultiple = new TableName[] { table1_restore, table2_restore };<a name="line.315"></a> +<span class="sourceLineNo">316</span> client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, backupIdIncMultiple2, false,<a name="line.316"></a> +<span class="sourceLineNo">317</span> tablesRestoreIncMultiple, tablesMapIncMultiple, true));<a name="line.317"></a> +<span class="sourceLineNo">318</span><a name="line.318"></a> +<span class="sourceLineNo">319</span> Table hTable = conn.getTable(table1_restore);<a name="line.319"></a> +<span class="sourceLineNo">320</span> LOG.debug("After incremental restore: " + hTable.getTableDescriptor());<a name="line.320"></a> +<span class="sourceLineNo">321</span> LOG.debug("f1 has " + TEST_UTIL.countRows(hTable, famName) + " rows");<a name="line.321"></a> +<span class="sourceLineNo">322</span> Assert.assertEquals(TEST_UTIL.countRows(hTable, famName), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.322"></a> +<span class="sourceLineNo">323</span><a name="line.323"></a> +<span class="sourceLineNo">324</span> hTable.close();<a name="line.324"></a> +<span class="sourceLineNo">325</span><a name="line.325"></a> +<span class="sourceLineNo">326</span> hTable = conn.getTable(table2_restore);<a name="line.326"></a> +<span class="sourceLineNo">327</span> Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.327"></a> +<span class="sourceLineNo">328</span> hTable.close();<a name="line.328"></a> +<span class="sourceLineNo">329</span><a name="line.329"></a> +<span class="sourceLineNo">330</span> admin.close();<a name="line.330"></a> +<span class="sourceLineNo">331</span> conn.close();<a name="line.331"></a> +<span class="sourceLineNo">332</span><a name="line.332"></a> +<span class="sourceLineNo">333</span> }<a name="line.333"></a> +<span class="sourceLineNo">334</span><a name="line.334"></a> +<span class="sourceLineNo">335</span>}<a name="line.335"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html index dbfd2da..cd31633 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html @@ -275,73 +275,72 @@ <span class="sourceLineNo">267</span><a name="line.267"></a> <span class="sourceLineNo">268</span> conf.set(FAILURE_PHASE_KEY, phase.toString());<a name="line.268"></a> <span class="sourceLineNo">269</span><a name="line.269"></a> -<span class="sourceLineNo">270</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn);)<a name="line.270"></a> -<span class="sourceLineNo">271</span> {<a name="line.271"></a> -<span class="sourceLineNo">272</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.272"></a> -<span class="sourceLineNo">273</span> bAdmin.mergeBackups(backups);<a name="line.273"></a> -<span class="sourceLineNo">274</span> Assert.fail("Expected IOException");<a name="line.274"></a> -<span class="sourceLineNo">275</span> } catch (IOException e) {<a name="line.275"></a> -<span class="sourceLineNo">276</span> BackupSystemTable table = new BackupSystemTable(conn);<a name="line.276"></a> -<span class="sourceLineNo">277</span> if(phase.ordinal() < FailurePhase.PHASE4.ordinal()) {<a name="line.277"></a> -<span class="sourceLineNo">278</span> // No need to repair:<a name="line.278"></a> -<span class="sourceLineNo">279</span> // Both Merge and backup exclusive operations are finished<a name="line.279"></a> -<span class="sourceLineNo">280</span> assertFalse(table.isMergeInProgress());<a name="line.280"></a> -<span class="sourceLineNo">281</span> try {<a name="line.281"></a> -<span class="sourceLineNo">282</span> table.finishBackupExclusiveOperation();<a name="line.282"></a> -<span class="sourceLineNo">283</span> Assert.fail("IOException is expected");<a name="line.283"></a> -<span class="sourceLineNo">284</span> } catch(IOException ee) {<a name="line.284"></a> -<span class="sourceLineNo">285</span> // Expected<a name="line.285"></a> -<span class="sourceLineNo">286</span> }<a name="line.286"></a> -<span class="sourceLineNo">287</span> } else {<a name="line.287"></a> -<span class="sourceLineNo">288</span> // Repair is required<a name="line.288"></a> -<span class="sourceLineNo">289</span> assertTrue(table.isMergeInProgress());<a name="line.289"></a> -<span class="sourceLineNo">290</span> try {<a name="line.290"></a> -<span class="sourceLineNo">291</span> table.startBackupExclusiveOperation();<a name="line.291"></a> -<span class="sourceLineNo">292</span> Assert.fail("IOException is expected");<a name="line.292"></a> -<span class="sourceLineNo">293</span> } catch(IOException ee) {<a name="line.293"></a> -<span class="sourceLineNo">294</span> // Expected - clean up before proceeding<a name="line.294"></a> -<span class="sourceLineNo">295</span> table.finishMergeOperation();<a name="line.295"></a> -<span class="sourceLineNo">296</span> table.finishBackupExclusiveOperation();<a name="line.296"></a> -<span class="sourceLineNo">297</span> }<a name="line.297"></a> -<span class="sourceLineNo">298</span> }<a name="line.298"></a> -<span class="sourceLineNo">299</span> table.close();<a name="line.299"></a> -<span class="sourceLineNo">300</span> LOG.debug("Expected :"+ e.getMessage());<a name="line.300"></a> -<span class="sourceLineNo">301</span> }<a name="line.301"></a> -<span class="sourceLineNo">302</span> }<a name="line.302"></a> -<span class="sourceLineNo">303</span><a name="line.303"></a> -<span class="sourceLineNo">304</span> // Now merge w/o failures<a name="line.304"></a> -<span class="sourceLineNo">305</span> Configuration conf = conn.getConfiguration();<a name="line.305"></a> -<span class="sourceLineNo">306</span> conf.unset(FAILURE_PHASE_KEY);<a name="line.306"></a> -<span class="sourceLineNo">307</span> conf.unset(BackupRestoreFactory.HBASE_BACKUP_MERGE_IMPL_CLASS);<a name="line.307"></a> -<span class="sourceLineNo">308</span><a name="line.308"></a> -<span class="sourceLineNo">309</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn);) {<a name="line.309"></a> -<span class="sourceLineNo">310</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.310"></a> -<span class="sourceLineNo">311</span> bAdmin.mergeBackups(backups);<a name="line.311"></a> -<span class="sourceLineNo">312</span> }<a name="line.312"></a> -<span class="sourceLineNo">313</span><a name="line.313"></a> -<span class="sourceLineNo">314</span> // #6 - restore incremental backup for multiple tables, with overwrite<a name="line.314"></a> -<span class="sourceLineNo">315</span> TableName[] tablesRestoreIncMultiple = new TableName[] { table1, table2 };<a name="line.315"></a> -<span class="sourceLineNo">316</span> TableName[] tablesMapIncMultiple = new TableName[] { table1_restore, table2_restore };<a name="line.316"></a> -<span class="sourceLineNo">317</span> client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, backupIdIncMultiple2, false,<a name="line.317"></a> -<span class="sourceLineNo">318</span> tablesRestoreIncMultiple, tablesMapIncMultiple, true));<a name="line.318"></a> -<span class="sourceLineNo">319</span><a name="line.319"></a> -<span class="sourceLineNo">320</span> Table hTable = conn.getTable(table1_restore);<a name="line.320"></a> -<span class="sourceLineNo">321</span> LOG.debug("After incremental restore: " + hTable.getTableDescriptor());<a name="line.321"></a> -<span class="sourceLineNo">322</span> LOG.debug("f1 has " + TEST_UTIL.countRows(hTable, famName) + " rows");<a name="line.322"></a> -<span class="sourceLineNo">323</span> Assert.assertEquals(TEST_UTIL.countRows(hTable, famName), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.323"></a> -<span class="sourceLineNo">324</span><a name="line.324"></a> -<span class="sourceLineNo">325</span> hTable.close();<a name="line.325"></a> -<span class="sourceLineNo">326</span><a name="line.326"></a> -<span class="sourceLineNo">327</span> hTable = conn.getTable(table2_restore);<a name="line.327"></a> -<span class="sourceLineNo">328</span> Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.328"></a> -<span class="sourceLineNo">329</span> hTable.close();<a name="line.329"></a> -<span class="sourceLineNo">330</span><a name="line.330"></a> -<span class="sourceLineNo">331</span> admin.close();<a name="line.331"></a> -<span class="sourceLineNo">332</span> conn.close();<a name="line.332"></a> -<span class="sourceLineNo">333</span><a name="line.333"></a> -<span class="sourceLineNo">334</span> }<a name="line.334"></a> -<span class="sourceLineNo">335</span><a name="line.335"></a> -<span class="sourceLineNo">336</span>}<a name="line.336"></a> +<span class="sourceLineNo">270</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn)) {<a name="line.270"></a> +<span class="sourceLineNo">271</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.271"></a> +<span class="sourceLineNo">272</span> bAdmin.mergeBackups(backups);<a name="line.272"></a> +<span class="sourceLineNo">273</span> Assert.fail("Expected IOException");<a name="line.273"></a> +<span class="sourceLineNo">274</span> } catch (IOException e) {<a name="line.274"></a> +<span class="sourceLineNo">275</span> BackupSystemTable table = new BackupSystemTable(conn);<a name="line.275"></a> +<span class="sourceLineNo">276</span> if(phase.ordinal() < FailurePhase.PHASE4.ordinal()) {<a name="line.276"></a> +<span class="sourceLineNo">277</span> // No need to repair:<a name="line.277"></a> +<span class="sourceLineNo">278</span> // Both Merge and backup exclusive operations are finished<a name="line.278"></a> +<span class="sourceLineNo">279</span> assertFalse(table.isMergeInProgress());<a name="line.279"></a> +<span class="sourceLineNo">280</span> try {<a name="line.280"></a> +<span class="sourceLineNo">281</span> table.finishBackupExclusiveOperation();<a name="line.281"></a> +<span class="sourceLineNo">282</span> Assert.fail("IOException is expected");<a name="line.282"></a> +<span class="sourceLineNo">283</span> } catch(IOException ee) {<a name="line.283"></a> +<span class="sourceLineNo">284</span> // Expected<a name="line.284"></a> +<span class="sourceLineNo">285</span> }<a name="line.285"></a> +<span class="sourceLineNo">286</span> } else {<a name="line.286"></a> +<span class="sourceLineNo">287</span> // Repair is required<a name="line.287"></a> +<span class="sourceLineNo">288</span> assertTrue(table.isMergeInProgress());<a name="line.288"></a> +<span class="sourceLineNo">289</span> try {<a name="line.289"></a> +<span class="sourceLineNo">290</span> table.startBackupExclusiveOperation();<a name="line.290"></a> +<span class="sourceLineNo">291</span> Assert.fail("IOException is expected");<a name="line.291"></a> +<span class="sourceLineNo">292</span> } catch(IOException ee) {<a name="line.292"></a> +<span class="sourceLineNo">293</span> // Expected - clean up before proceeding<a name="line.293"></a> +<span class="sourceLineNo">294</span> table.finishMergeOperation();<a name="line.294"></a> +<span class="sourceLineNo">295</span> table.finishBackupExclusiveOperation();<a name="line.295"></a> +<span class="sourceLineNo">296</span> }<a name="line.296"></a> +<span class="sourceLineNo">297</span> }<a name="line.297"></a> +<span class="sourceLineNo">298</span> table.close();<a name="line.298"></a> +<span class="sourceLineNo">299</span> LOG.debug("Expected :"+ e.getMessage());<a name="line.299"></a> +<span class="sourceLineNo">300</span> }<a name="line.300"></a> +<span class="sourceLineNo">301</span> }<a name="line.301"></a> +<span class="sourceLineNo">302</span><a name="line.302"></a> +<span class="sourceLineNo">303</span> // Now merge w/o failures<a name="line.303"></a> +<span class="sourceLineNo">304</span> Configuration conf = conn.getConfiguration();<a name="line.304"></a> +<span class="sourceLineNo">305</span> conf.unset(FAILURE_PHASE_KEY);<a name="line.305"></a> +<span class="sourceLineNo">306</span> conf.unset(BackupRestoreFactory.HBASE_BACKUP_MERGE_IMPL_CLASS);<a name="line.306"></a> +<span class="sourceLineNo">307</span><a name="line.307"></a> +<span class="sourceLineNo">308</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn)) {<a name="line.308"></a> +<span class="sourceLineNo">309</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.309"></a> +<span class="sourceLineNo">310</span> bAdmin.mergeBackups(backups);<a name="line.310"></a> +<span class="sourceLineNo">311</span> }<a name="line.311"></a> +<span class="sourceLineNo">312</span><a name="line.312"></a> +<span class="sourceLineNo">313</span> // #6 - restore incremental backup for multiple tables, with overwrite<a name="line.313"></a> +<span class="sourceLineNo">314</span> TableName[] tablesRestoreIncMultiple = new TableName[] { table1, table2 };<a name="line.314"></a> +<span class="sourceLineNo">315</span> TableName[] tablesMapIncMultiple = new TableName[] { table1_restore, table2_restore };<a name="line.315"></a> +<span class="sourceLineNo">316</span> client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, backupIdIncMultiple2, false,<a name="line.316"></a> +<span class="sourceLineNo">317</span> tablesRestoreIncMultiple, tablesMapIncMultiple, true));<a name="line.317"></a> +<span class="sourceLineNo">318</span><a name="line.318"></a> +<span class="sourceLineNo">319</span> Table hTable = conn.getTable(table1_restore);<a name="line.319"></a> +<span class="sourceLineNo">320</span> LOG.debug("After incremental restore: " + hTable.getTableDescriptor());<a name="line.320"></a> +<span class="sourceLineNo">321</span> LOG.debug("f1 has " + TEST_UTIL.countRows(hTable, famName) + " rows");<a name="line.321"></a> +<span class="sourceLineNo">322</span> Assert.assertEquals(TEST_UTIL.countRows(hTable, famName), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.322"></a> +<span class="sourceLineNo">323</span><a name="line.323"></a> +<span class="sourceLineNo">324</span> hTable.close();<a name="line.324"></a> +<span class="sourceLineNo">325</span><a name="line.325"></a> +<span class="sourceLineNo">326</span> hTable = conn.getTable(table2_restore);<a name="line.326"></a> +<span class="sourceLineNo">327</span> Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.327"></a> +<span class="sourceLineNo">328</span> hTable.close();<a name="line.328"></a> +<span class="sourceLineNo">329</span><a name="line.329"></a> +<span class="sourceLineNo">330</span> admin.close();<a name="line.330"></a> +<span class="sourceLineNo">331</span> conn.close();<a name="line.331"></a> +<span class="sourceLineNo">332</span><a name="line.332"></a> +<span class="sourceLineNo">333</span> }<a name="line.333"></a> +<span class="sourceLineNo">334</span><a name="line.334"></a> +<span class="sourceLineNo">335</span>}<a name="line.335"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.html index dbfd2da..cd31633 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.html @@ -275,73 +275,72 @@ <span class="sourceLineNo">267</span><a name="line.267"></a> <span class="sourceLineNo">268</span> conf.set(FAILURE_PHASE_KEY, phase.toString());<a name="line.268"></a> <span class="sourceLineNo">269</span><a name="line.269"></a> -<span class="sourceLineNo">270</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn);)<a name="line.270"></a> -<span class="sourceLineNo">271</span> {<a name="line.271"></a> -<span class="sourceLineNo">272</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.272"></a> -<span class="sourceLineNo">273</span> bAdmin.mergeBackups(backups);<a name="line.273"></a> -<span class="sourceLineNo">274</span> Assert.fail("Expected IOException");<a name="line.274"></a> -<span class="sourceLineNo">275</span> } catch (IOException e) {<a name="line.275"></a> -<span class="sourceLineNo">276</span> BackupSystemTable table = new BackupSystemTable(conn);<a name="line.276"></a> -<span class="sourceLineNo">277</span> if(phase.ordinal() < FailurePhase.PHASE4.ordinal()) {<a name="line.277"></a> -<span class="sourceLineNo">278</span> // No need to repair:<a name="line.278"></a> -<span class="sourceLineNo">279</span> // Both Merge and backup exclusive operations are finished<a name="line.279"></a> -<span class="sourceLineNo">280</span> assertFalse(table.isMergeInProgress());<a name="line.280"></a> -<span class="sourceLineNo">281</span> try {<a name="line.281"></a> -<span class="sourceLineNo">282</span> table.finishBackupExclusiveOperation();<a name="line.282"></a> -<span class="sourceLineNo">283</span> Assert.fail("IOException is expected");<a name="line.283"></a> -<span class="sourceLineNo">284</span> } catch(IOException ee) {<a name="line.284"></a> -<span class="sourceLineNo">285</span> // Expected<a name="line.285"></a> -<span class="sourceLineNo">286</span> }<a name="line.286"></a> -<span class="sourceLineNo">287</span> } else {<a name="line.287"></a> -<span class="sourceLineNo">288</span> // Repair is required<a name="line.288"></a> -<span class="sourceLineNo">289</span> assertTrue(table.isMergeInProgress());<a name="line.289"></a> -<span class="sourceLineNo">290</span> try {<a name="line.290"></a> -<span class="sourceLineNo">291</span> table.startBackupExclusiveOperation();<a name="line.291"></a> -<span class="sourceLineNo">292</span> Assert.fail("IOException is expected");<a name="line.292"></a> -<span class="sourceLineNo">293</span> } catch(IOException ee) {<a name="line.293"></a> -<span class="sourceLineNo">294</span> // Expected - clean up before proceeding<a name="line.294"></a> -<span class="sourceLineNo">295</span> table.finishMergeOperation();<a name="line.295"></a> -<span class="sourceLineNo">296</span> table.finishBackupExclusiveOperation();<a name="line.296"></a> -<span class="sourceLineNo">297</span> }<a name="line.297"></a> -<span class="sourceLineNo">298</span> }<a name="line.298"></a> -<span class="sourceLineNo">299</span> table.close();<a name="line.299"></a> -<span class="sourceLineNo">300</span> LOG.debug("Expected :"+ e.getMessage());<a name="line.300"></a> -<span class="sourceLineNo">301</span> }<a name="line.301"></a> -<span class="sourceLineNo">302</span> }<a name="line.302"></a> -<span class="sourceLineNo">303</span><a name="line.303"></a> -<span class="sourceLineNo">304</span> // Now merge w/o failures<a name="line.304"></a> -<span class="sourceLineNo">305</span> Configuration conf = conn.getConfiguration();<a name="line.305"></a> -<span class="sourceLineNo">306</span> conf.unset(FAILURE_PHASE_KEY);<a name="line.306"></a> -<span class="sourceLineNo">307</span> conf.unset(BackupRestoreFactory.HBASE_BACKUP_MERGE_IMPL_CLASS);<a name="line.307"></a> -<span class="sourceLineNo">308</span><a name="line.308"></a> -<span class="sourceLineNo">309</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn);) {<a name="line.309"></a> -<span class="sourceLineNo">310</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.310"></a> -<span class="sourceLineNo">311</span> bAdmin.mergeBackups(backups);<a name="line.311"></a> -<span class="sourceLineNo">312</span> }<a name="line.312"></a> -<span class="sourceLineNo">313</span><a name="line.313"></a> -<span class="sourceLineNo">314</span> // #6 - restore incremental backup for multiple tables, with overwrite<a name="line.314"></a> -<span class="sourceLineNo">315</span> TableName[] tablesRestoreIncMultiple = new TableName[] { table1, table2 };<a name="line.315"></a> -<span class="sourceLineNo">316</span> TableName[] tablesMapIncMultiple = new TableName[] { table1_restore, table2_restore };<a name="line.316"></a> -<span class="sourceLineNo">317</span> client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, backupIdIncMultiple2, false,<a name="line.317"></a> -<span class="sourceLineNo">318</span> tablesRestoreIncMultiple, tablesMapIncMultiple, true));<a name="line.318"></a> -<span class="sourceLineNo">319</span><a name="line.319"></a> -<span class="sourceLineNo">320</span> Table hTable = conn.getTable(table1_restore);<a name="line.320"></a> -<span class="sourceLineNo">321</span> LOG.debug("After incremental restore: " + hTable.getTableDescriptor());<a name="line.321"></a> -<span class="sourceLineNo">322</span> LOG.debug("f1 has " + TEST_UTIL.countRows(hTable, famName) + " rows");<a name="line.322"></a> -<span class="sourceLineNo">323</span> Assert.assertEquals(TEST_UTIL.countRows(hTable, famName), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.323"></a> -<span class="sourceLineNo">324</span><a name="line.324"></a> -<span class="sourceLineNo">325</span> hTable.close();<a name="line.325"></a> -<span class="sourceLineNo">326</span><a name="line.326"></a> -<span class="sourceLineNo">327</span> hTable = conn.getTable(table2_restore);<a name="line.327"></a> -<span class="sourceLineNo">328</span> Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.328"></a> -<span class="sourceLineNo">329</span> hTable.close();<a name="line.329"></a> -<span class="sourceLineNo">330</span><a name="line.330"></a> -<span class="sourceLineNo">331</span> admin.close();<a name="line.331"></a> -<span class="sourceLineNo">332</span> conn.close();<a name="line.332"></a> -<span class="sourceLineNo">333</span><a name="line.333"></a> -<span class="sourceLineNo">334</span> }<a name="line.334"></a> -<span class="sourceLineNo">335</span><a name="line.335"></a> -<span class="sourceLineNo">336</span>}<a name="line.336"></a> +<span class="sourceLineNo">270</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn)) {<a name="line.270"></a> +<span class="sourceLineNo">271</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.271"></a> +<span class="sourceLineNo">272</span> bAdmin.mergeBackups(backups);<a name="line.272"></a> +<span class="sourceLineNo">273</span> Assert.fail("Expected IOException");<a name="line.273"></a> +<span class="sourceLineNo">274</span> } catch (IOException e) {<a name="line.274"></a> +<span class="sourceLineNo">275</span> BackupSystemTable table = new BackupSystemTable(conn);<a name="line.275"></a> +<span class="sourceLineNo">276</span> if(phase.ordinal() < FailurePhase.PHASE4.ordinal()) {<a name="line.276"></a> +<span class="sourceLineNo">277</span> // No need to repair:<a name="line.277"></a> +<span class="sourceLineNo">278</span> // Both Merge and backup exclusive operations are finished<a name="line.278"></a> +<span class="sourceLineNo">279</span> assertFalse(table.isMergeInProgress());<a name="line.279"></a> +<span class="sourceLineNo">280</span> try {<a name="line.280"></a> +<span class="sourceLineNo">281</span> table.finishBackupExclusiveOperation();<a name="line.281"></a> +<span class="sourceLineNo">282</span> Assert.fail("IOException is expected");<a name="line.282"></a> +<span class="sourceLineNo">283</span> } catch(IOException ee) {<a name="line.283"></a> +<span class="sourceLineNo">284</span> // Expected<a name="line.284"></a> +<span class="sourceLineNo">285</span> }<a name="line.285"></a> +<span class="sourceLineNo">286</span> } else {<a name="line.286"></a> +<span class="sourceLineNo">287</span> // Repair is required<a name="line.287"></a> +<span class="sourceLineNo">288</span> assertTrue(table.isMergeInProgress());<a name="line.288"></a> +<span class="sourceLineNo">289</span> try {<a name="line.289"></a> +<span class="sourceLineNo">290</span> table.startBackupExclusiveOperation();<a name="line.290"></a> +<span class="sourceLineNo">291</span> Assert.fail("IOException is expected");<a name="line.291"></a> +<span class="sourceLineNo">292</span> } catch(IOException ee) {<a name="line.292"></a> +<span class="sourceLineNo">293</span> // Expected - clean up before proceeding<a name="line.293"></a> +<span class="sourceLineNo">294</span> table.finishMergeOperation();<a name="line.294"></a> +<span class="sourceLineNo">295</span> table.finishBackupExclusiveOperation();<a name="line.295"></a> +<span class="sourceLineNo">296</span> }<a name="line.296"></a> +<span class="sourceLineNo">297</span> }<a name="line.297"></a> +<span class="sourceLineNo">298</span> table.close();<a name="line.298"></a> +<span class="sourceLineNo">299</span> LOG.debug("Expected :"+ e.getMessage());<a name="line.299"></a> +<span class="sourceLineNo">300</span> }<a name="line.300"></a> +<span class="sourceLineNo">301</span> }<a name="line.301"></a> +<span class="sourceLineNo">302</span><a name="line.302"></a> +<span class="sourceLineNo">303</span> // Now merge w/o failures<a name="line.303"></a> +<span class="sourceLineNo">304</span> Configuration conf = conn.getConfiguration();<a name="line.304"></a> +<span class="sourceLineNo">305</span> conf.unset(FAILURE_PHASE_KEY);<a name="line.305"></a> +<span class="sourceLineNo">306</span> conf.unset(BackupRestoreFactory.HBASE_BACKUP_MERGE_IMPL_CLASS);<a name="line.306"></a> +<span class="sourceLineNo">307</span><a name="line.307"></a> +<span class="sourceLineNo">308</span> try (BackupAdmin bAdmin = new BackupAdminImpl(conn)) {<a name="line.308"></a> +<span class="sourceLineNo">309</span> String[] backups = new String[] { backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.309"></a> +<span class="sourceLineNo">310</span> bAdmin.mergeBackups(backups);<a name="line.310"></a> +<span class="sourceLineNo">311</span> }<a name="line.311"></a> +<span class="sourceLineNo">312</span><a name="line.312"></a> +<span class="sourceLineNo">313</span> // #6 - restore incremental backup for multiple tables, with overwrite<a name="line.313"></a> +<span class="sourceLineNo">314</span> TableName[] tablesRestoreIncMultiple = new TableName[] { table1, table2 };<a name="line.314"></a> +<span class="sourceLineNo">315</span> TableName[] tablesMapIncMultiple = new TableName[] { table1_restore, table2_restore };<a name="line.315"></a> +<span class="sourceLineNo">316</span> client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, backupIdIncMultiple2, false,<a name="line.316"></a> +<span class="sourceLineNo">317</span> tablesRestoreIncMultiple, tablesMapIncMultiple, true));<a name="line.317"></a> +<span class="sourceLineNo">318</span><a name="line.318"></a> +<span class="sourceLineNo">319</span> Table hTable = conn.getTable(table1_restore);<a name="line.319"></a> +<span class="sourceLineNo">320</span> LOG.debug("After incremental restore: " + hTable.getTableDescriptor());<a name="line.320"></a> +<span class="sourceLineNo">321</span> LOG.debug("f1 has " + TEST_UTIL.countRows(hTable, famName) + " rows");<a name="line.321"></a> +<span class="sourceLineNo">322</span> Assert.assertEquals(TEST_UTIL.countRows(hTable, famName), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.322"></a> +<span class="sourceLineNo">323</span><a name="line.323"></a> +<span class="sourceLineNo">324</span> hTable.close();<a name="line.324"></a> +<span class="sourceLineNo">325</span><a name="line.325"></a> +<span class="sourceLineNo">326</span> hTable = conn.getTable(table2_restore);<a name="line.326"></a> +<span class="sourceLineNo">327</span> Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 2 * ADD_ROWS);<a name="line.327"></a> +<span class="sourceLineNo">328</span> hTable.close();<a name="line.328"></a> +<span class="sourceLineNo">329</span><a name="line.329"></a> +<span class="sourceLineNo">330</span> admin.close();<a name="line.330"></a> +<span class="sourceLineNo">331</span> conn.close();<a name="line.331"></a> +<span class="sourceLineNo">332</span><a name="line.332"></a> +<span class="sourceLineNo">333</span> }<a name="line.333"></a> +<span class="sourceLineNo">334</span><a name="line.334"></a> +<span class="sourceLineNo">335</span>}<a name="line.335"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsExceptMetaAction.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsExceptMetaAction.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsExceptMetaAction.html index 69e3a11..c2d5b9a 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsExceptMetaAction.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsExceptMetaAction.html @@ -46,9 +46,8 @@ <span class="sourceLineNo">038</span> List<ServerName> servers = super.selectServers();<a name="line.38"></a> <span class="sourceLineNo">039</span> servers.remove(metaServer);<a name="line.39"></a> <span class="sourceLineNo">040</span> return servers;<a name="line.40"></a> -<span class="sourceLineNo">041</span> };<a name="line.41"></a> -<span class="sourceLineNo">042</span><a name="line.42"></a> -<span class="sourceLineNo">043</span>}<a name="line.43"></a> +<span class="sourceLineNo">041</span> }<a name="line.41"></a> +<span class="sourceLineNo">042</span>}<a name="line.42"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.AsyncProcessForThrowableCheck.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.AsyncProcessForThrowableCheck.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.AsyncProcessForThrowableCheck.html index 7df267c..8029a34 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.AsyncProcessForThrowableCheck.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.AsyncProcessForThrowableCheck.html @@ -667,7 +667,7 @@ <span class="sourceLineNo">659</span><a name="line.659"></a> <span class="sourceLineNo">660</span> MyAsyncProcess ap = new MyAsyncProcess(conn, CONF, true);<a name="line.660"></a> <span class="sourceLineNo">661</span> BufferedMutatorParams bufferParam = createBufferedMutatorParams(ap, DUMMY_TABLE);<a name="line.661"></a> -<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap);) {<a name="line.662"></a> +<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap)) {<a name="line.662"></a> <span class="sourceLineNo">663</span> mutator.mutate(puts);<a name="line.663"></a> <span class="sourceLineNo">664</span> mutator.flush();<a name="line.664"></a> <span class="sourceLineNo">665</span> List<AsyncRequestFuture> reqs = ap.allReqs;<a name="line.665"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.AsyncProcessWithFailure.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.AsyncProcessWithFailure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.AsyncProcessWithFailure.html index 7df267c..8029a34 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.AsyncProcessWithFailure.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.AsyncProcessWithFailure.html @@ -667,7 +667,7 @@ <span class="sourceLineNo">659</span><a name="line.659"></a> <span class="sourceLineNo">660</span> MyAsyncProcess ap = new MyAsyncProcess(conn, CONF, true);<a name="line.660"></a> <span class="sourceLineNo">661</span> BufferedMutatorParams bufferParam = createBufferedMutatorParams(ap, DUMMY_TABLE);<a name="line.661"></a> -<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap);) {<a name="line.662"></a> +<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap)) {<a name="line.662"></a> <span class="sourceLineNo">663</span> mutator.mutate(puts);<a name="line.663"></a> <span class="sourceLineNo">664</span> mutator.flush();<a name="line.664"></a> <span class="sourceLineNo">665</span> List<AsyncRequestFuture> reqs = ap.allReqs;<a name="line.665"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.CallerWithFailure.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.CallerWithFailure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.CallerWithFailure.html index 7df267c..8029a34 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.CallerWithFailure.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.CallerWithFailure.html @@ -667,7 +667,7 @@ <span class="sourceLineNo">659</span><a name="line.659"></a> <span class="sourceLineNo">660</span> MyAsyncProcess ap = new MyAsyncProcess(conn, CONF, true);<a name="line.660"></a> <span class="sourceLineNo">661</span> BufferedMutatorParams bufferParam = createBufferedMutatorParams(ap, DUMMY_TABLE);<a name="line.661"></a> -<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap);) {<a name="line.662"></a> +<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap)) {<a name="line.662"></a> <span class="sourceLineNo">663</span> mutator.mutate(puts);<a name="line.663"></a> <span class="sourceLineNo">664</span> mutator.flush();<a name="line.664"></a> <span class="sourceLineNo">665</span> List<AsyncRequestFuture> reqs = ap.allReqs;<a name="line.665"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.CountingThreadFactory.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.CountingThreadFactory.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.CountingThreadFactory.html index 7df267c..8029a34 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.CountingThreadFactory.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.CountingThreadFactory.html @@ -667,7 +667,7 @@ <span class="sourceLineNo">659</span><a name="line.659"></a> <span class="sourceLineNo">660</span> MyAsyncProcess ap = new MyAsyncProcess(conn, CONF, true);<a name="line.660"></a> <span class="sourceLineNo">661</span> BufferedMutatorParams bufferParam = createBufferedMutatorParams(ap, DUMMY_TABLE);<a name="line.661"></a> -<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap);) {<a name="line.662"></a> +<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap)) {<a name="line.662"></a> <span class="sourceLineNo">663</span> mutator.mutate(puts);<a name="line.663"></a> <span class="sourceLineNo">664</span> mutator.flush();<a name="line.664"></a> <span class="sourceLineNo">665</span> List<AsyncRequestFuture> reqs = ap.allReqs;<a name="line.665"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncProcess.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncProcess.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncProcess.html index 7df267c..8029a34 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncProcess.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncProcess.html @@ -667,7 +667,7 @@ <span class="sourceLineNo">659</span><a name="line.659"></a> <span class="sourceLineNo">660</span> MyAsyncProcess ap = new MyAsyncProcess(conn, CONF, true);<a name="line.660"></a> <span class="sourceLineNo">661</span> BufferedMutatorParams bufferParam = createBufferedMutatorParams(ap, DUMMY_TABLE);<a name="line.661"></a> -<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap);) {<a name="line.662"></a> +<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap)) {<a name="line.662"></a> <span class="sourceLineNo">663</span> mutator.mutate(puts);<a name="line.663"></a> <span class="sourceLineNo">664</span> mutator.flush();<a name="line.664"></a> <span class="sourceLineNo">665</span> List<AsyncRequestFuture> reqs = ap.allReqs;<a name="line.665"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncProcessWithReplicas.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncProcessWithReplicas.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncProcessWithReplicas.html index 7df267c..8029a34 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncProcessWithReplicas.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncProcessWithReplicas.html @@ -667,7 +667,7 @@ <span class="sourceLineNo">659</span><a name="line.659"></a> <span class="sourceLineNo">660</span> MyAsyncProcess ap = new MyAsyncProcess(conn, CONF, true);<a name="line.660"></a> <span class="sourceLineNo">661</span> BufferedMutatorParams bufferParam = createBufferedMutatorParams(ap, DUMMY_TABLE);<a name="line.661"></a> -<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap);) {<a name="line.662"></a> +<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap)) {<a name="line.662"></a> <span class="sourceLineNo">663</span> mutator.mutate(puts);<a name="line.663"></a> <span class="sourceLineNo">664</span> mutator.flush();<a name="line.664"></a> <span class="sourceLineNo">665</span> List<AsyncRequestFuture> reqs = ap.allReqs;<a name="line.665"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncRequestFutureImpl.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncRequestFutureImpl.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncRequestFutureImpl.html index 7df267c..8029a34 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncRequestFutureImpl.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyAsyncRequestFutureImpl.html @@ -667,7 +667,7 @@ <span class="sourceLineNo">659</span><a name="line.659"></a> <span class="sourceLineNo">660</span> MyAsyncProcess ap = new MyAsyncProcess(conn, CONF, true);<a name="line.660"></a> <span class="sourceLineNo">661</span> BufferedMutatorParams bufferParam = createBufferedMutatorParams(ap, DUMMY_TABLE);<a name="line.661"></a> -<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap);) {<a name="line.662"></a> +<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap)) {<a name="line.662"></a> <span class="sourceLineNo">663</span> mutator.mutate(puts);<a name="line.663"></a> <span class="sourceLineNo">664</span> mutator.flush();<a name="line.664"></a> <span class="sourceLineNo">665</span> List<AsyncRequestFuture> reqs = ap.allReqs;<a name="line.665"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyClientBackoffPolicy.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyClientBackoffPolicy.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyClientBackoffPolicy.html index 7df267c..8029a34 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyClientBackoffPolicy.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncProcess.MyClientBackoffPolicy.html @@ -667,7 +667,7 @@ <span class="sourceLineNo">659</span><a name="line.659"></a> <span class="sourceLineNo">660</span> MyAsyncProcess ap = new MyAsyncProcess(conn, CONF, true);<a name="line.660"></a> <span class="sourceLineNo">661</span> BufferedMutatorParams bufferParam = createBufferedMutatorParams(ap, DUMMY_TABLE);<a name="line.661"></a> -<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap);) {<a name="line.662"></a> +<span class="sourceLineNo">662</span> try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap)) {<a name="line.662"></a> <span class="sourceLineNo">663</span> mutator.mutate(puts);<a name="line.663"></a> <span class="sourceLineNo">664</span> mutator.flush();<a name="line.664"></a> <span class="sourceLineNo">665</span> List<AsyncRequestFuture> reqs = ap.allReqs;<a name="line.665"></a>
