http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/org/apache/hadoop/hbase/backup/class-use/TestBackupMerge.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/backup/class-use/TestBackupMerge.html 
b/testdevapidocs/org/apache/hadoop/hbase/backup/class-use/TestBackupMerge.html
new file mode 100644
index 0000000..c2e901d
--- /dev/null
+++ 
b/testdevapidocs/org/apache/hadoop/hbase/backup/class-use/TestBackupMerge.html
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class org.apache.hadoop.hbase.backup.TestBackupMerge (Apache 
HBase 3.0.0-SNAPSHOT Test API)</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" 
title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class 
org.apache.hadoop.hbase.backup.TestBackupMerge (Apache HBase 3.0.0-SNAPSHOT 
Test API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a 
href="../../../../../../org/apache/hadoop/hbase/backup/TestBackupMerge.html" 
title="class in org.apache.hadoop.hbase.backup">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../../index.html?org/apache/hadoop/hbase/backup/class-use/TestBackupMerge.html"
 target="_top">Frames</a></li>
+<li><a href="TestBackupMerge.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a 
href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class org.apache.hadoop.hbase.backup.TestBackupMerge" 
class="title">Uses of 
Class<br>org.apache.hadoop.hbase.backup.TestBackupMerge</h2>
+</div>
+<div class="classUseContainer">No usage of 
org.apache.hadoop.hbase.backup.TestBackupMerge</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a 
href="../../../../../../org/apache/hadoop/hbase/backup/TestBackupMerge.html" 
title="class in org.apache.hadoop.hbase.backup">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../../../index.html?org/apache/hadoop/hbase/backup/class-use/TestBackupMerge.html"
 target="_top">Frames</a></li>
+<li><a href="TestBackupMerge.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a 
href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2018 <a 
href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</small></p>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/org/apache/hadoop/hbase/backup/package-frame.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/backup/package-frame.html 
b/testdevapidocs/org/apache/hadoop/hbase/backup/package-frame.html
index 76ce284..2e9bb7b 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/backup/package-frame.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/backup/package-frame.html
@@ -24,6 +24,7 @@
 <li><a href="TestBackupDeleteWithFailures.MasterSnapshotObserver.html" 
title="class in org.apache.hadoop.hbase.backup" 
target="classFrame">TestBackupDeleteWithFailures.MasterSnapshotObserver</a></li>
 <li><a href="TestBackupDescribe.html" title="class in 
org.apache.hadoop.hbase.backup" target="classFrame">TestBackupDescribe</a></li>
 <li><a href="TestBackupHFileCleaner.html" title="class in 
org.apache.hadoop.hbase.backup" 
target="classFrame">TestBackupHFileCleaner</a></li>
+<li><a href="TestBackupMerge.html" title="class in 
org.apache.hadoop.hbase.backup" target="classFrame">TestBackupMerge</a></li>
 <li><a href="TestBackupMultipleDeletes.html" title="class in 
org.apache.hadoop.hbase.backup" 
target="classFrame">TestBackupMultipleDeletes</a></li>
 <li><a href="TestBackupRepair.html" title="class in 
org.apache.hadoop.hbase.backup" target="classFrame">TestBackupRepair</a></li>
 <li><a href="TestBackupShowHistory.html" title="class in 
org.apache.hadoop.hbase.backup" 
target="classFrame">TestBackupShowHistory</a></li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/org/apache/hadoop/hbase/backup/package-summary.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/backup/package-summary.html 
b/testdevapidocs/org/apache/hadoop/hbase/backup/package-summary.html
index 125a5d5..be7efb8 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/backup/package-summary.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/backup/package-summary.html
@@ -131,105 +131,109 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupMerge.html" 
title="class in org.apache.hadoop.hbase.backup">TestBackupMerge</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupMultipleDeletes.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestBackupMultipleDeletes</a></td>
 <td class="colLast">
 <div class="block">Create multiple backups for two tables: table1, table2 then 
perform 1 delete</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupRepair.html" 
title="class in org.apache.hadoop.hbase.backup">TestBackupRepair</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupShowHistory.html" 
title="class in org.apache.hadoop.hbase.backup">TestBackupShowHistory</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupSmallTests.html" 
title="class in org.apache.hadoop.hbase.backup">TestBackupSmallTests</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupStatusProgress.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestBackupStatusProgress</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupSystemTable.html" 
title="class in org.apache.hadoop.hbase.backup">TestBackupSystemTable</a></td>
 <td class="colLast">
 <div class="block">Test cases for backup system table API</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestFullBackup.html" 
title="class in org.apache.hadoop.hbase.backup">TestFullBackup</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestFullBackupSet.html" 
title="class in org.apache.hadoop.hbase.backup">TestFullBackupSet</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestFullBackupSetRestoreSet.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestFullBackupSetRestoreSet</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestFullBackupWithFailures.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestFullBackupWithFailures</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestFullRestore.html" 
title="class in org.apache.hadoop.hbase.backup">TestFullRestore</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestHFileArchiving.html" 
title="class in org.apache.hadoop.hbase.backup">TestHFileArchiving</a></td>
 <td class="colLast">
 <div class="block">Test that the <code>HFileArchiver</code> correctly removes 
all the parts of a region when cleaning up
  a region</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackup.html" 
title="class in org.apache.hadoop.hbase.backup">TestIncrementalBackup</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupDeleteTable.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestIncrementalBackupDeleteTable</a></td>
 <td class="colLast">
 <div class="block">1.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestIncrementalBackupMergeWithFailures</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupWithBulkLoad.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestIncrementalBackupWithBulkLoad</a></td>
 <td class="colLast">
 <div class="block">1.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupWithFailures.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestIncrementalBackupWithFailures</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestRemoteBackup.html" 
title="class in org.apache.hadoop.hbase.backup">TestRemoteBackup</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestRemoteRestore.html" 
title="class in org.apache.hadoop.hbase.backup">TestRemoteRestore</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestRepairAfterFailedDelete.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestRepairAfterFailedDelete</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestRestoreBoundaryTests.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestRestoreBoundaryTests</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestSystemTableSnapshot.html"
 title="class in 
org.apache.hadoop.hbase.backup">TestSystemTableSnapshot</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html 
b/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index d422ab3..f31348f 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
@@ -107,6 +107,7 @@
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.html"
 title="class in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupDeleteRestore</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.html"
 title="class in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupDeleteWithFailures</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupDescribe.html" 
title="class in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupDescribe</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupMerge.html" 
title="class in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupMerge</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupMultipleDeletes.html"
 title="class in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupMultipleDeletes</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupRepair.html" 
title="class in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupRepair</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupShowHistory.html" 
title="class in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupShowHistory</span></a></li>
@@ -143,8 +144,8 @@
 <ul>
 <li type="circle">java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.backup.<a 
href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html"
 title="enum in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestIncrementalBackupMergeWithFailures.FailurePhase</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.Failure.html"
 title="enum in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupDeleteWithFailures.Failure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a 
href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html"
 title="enum in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestIncrementalBackupMergeWithFailures.FailurePhase</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html 
b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
index 15ca1d7..570df8a 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
@@ -847,18 +847,22 @@
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" 
title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">TestBackupShowHistory.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupShowHistory.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">TestBackupMerge.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupMerge.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" 
title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">TestBackupCommandLineTool.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">TestBackupShowHistory.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupShowHistory.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" 
title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span 
class="typeNameLabel">TestFullRestore.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestFullRestore.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
+<td class="colLast"><span 
class="typeNameLabel">TestBackupCommandLineTool.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" 
title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
+<td class="colLast"><span 
class="typeNameLabel">TestFullRestore.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestFullRestore.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" 
title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
 <td class="colLast"><span 
class="typeNameLabel">TestBackupSmallTests.</span><code><span 
class="memberNameLink"><a 
href="../../../../../org/apache/hadoop/hbase/backup/TestBackupSmallTests.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html 
b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index 4837d80..ec56445 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -158,8 +158,8 @@
 <ul>
 <li type="circle">java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/TagUsage.html" 
title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">TagUsage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.CacheOnWriteType.html"
 title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">TestCacheOnWrite.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a 
href="../../../../../../org/apache/hadoop/hbase/io/hfile/TagUsage.html" 
title="enum in org.apache.hadoop.hbase.io.hfile"><span 
class="typeNameLink">TagUsage</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html 
b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index cc127ba..27fc263 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -576,13 +576,13 @@
 <li type="circle">java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html"
 title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">ResourceChecker.Phase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html"
 title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html"
 title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">ClusterManager.ServiceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">ResourceChecker.Phase</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html"
 title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" 
title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html"
 title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a 
href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html"
 title="enum in org.apache.hadoop.hbase"><span 
class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html 
b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index ca2f47e..b72e392 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -205,8 +205,8 @@
 <ul>
 <li type="circle">java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a 
href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html"
 title="enum in org.apache.hadoop.hbase.procedure2"><span 
class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a 
href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html"
 title="enum in org.apache.hadoop.hbase.procedure2"><span 
class="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a 
href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html"
 title="enum in org.apache.hadoop.hbase.procedure2"><span 
class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a 
href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html"
 title="enum in org.apache.hadoop.hbase.procedure2"><span 
class="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html 
b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 558ff8e..18520c7 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -652,11 +652,11 @@
 <ul>
 <li type="circle">java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.ActionType.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestMultiLogThreshold.ActionType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html 
b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index ab7cd54..9327c6e 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -253,10 +253,10 @@
 <ul>
 <li type="circle">java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/overview-tree.html 
b/testdevapidocs/overview-tree.html
index 9db3dde..3aaa45a 100644
--- a/testdevapidocs/overview-tree.html
+++ b/testdevapidocs/overview-tree.html
@@ -2249,6 +2249,7 @@
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.html" 
title="class in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupDeleteWithFailures</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="org/apache/hadoop/hbase/backup/TestBackupDescribe.html" title="class in 
org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupDescribe</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.master.<a 
href="org/apache/hadoop/hbase/backup/master/TestBackupLogCleaner.html" 
title="class in org.apache.hadoop.hbase.backup.master"><span 
class="typeNameLink">TestBackupLogCleaner</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a 
href="org/apache/hadoop/hbase/backup/TestBackupMerge.html" title="class in 
org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupMerge</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="org/apache/hadoop/hbase/backup/TestBackupMultipleDeletes.html" 
title="class in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupMultipleDeletes</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="org/apache/hadoop/hbase/backup/TestBackupRepair.html" title="class in 
org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupRepair</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a 
href="org/apache/hadoop/hbase/backup/TestBackupShowHistory.html" title="class 
in org.apache.hadoop.hbase.backup"><span 
class="typeNameLink">TestBackupShowHistory</span></a></li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupMerge.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupMerge.html 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupMerge.html
new file mode 100644
index 0000000..04cf3ad
--- /dev/null
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupMerge.html
@@ -0,0 +1,204 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for 
additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file 
except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License.  You may obtain a 
copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific 
language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a 
name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.backup;<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.assertTrue;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.List;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.backup.impl.BackupAdminImpl;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.backup.util.BackupUtils;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.client.HBaseAdmin;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.client.HTable;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.client.Table;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.junit.Assert;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.junit.ClassRule;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.junit.Test;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.junit.experimental.categories.Category;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.slf4j.Logger;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.slf4j.LoggerFactory;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>@Category(LargeTests.class)<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>public class TestBackupMerge extends 
TestBackupBase {<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>  @ClassRule<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.46"></a>
+<span class="sourceLineNo">047</span>      
HBaseClassTestRule.forClass(TestBackupMerge.class);<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>  private static final Logger LOG =<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span>      
LoggerFactory.getLogger(TestBackupMerge.class);<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>  @Test<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  public void TestIncBackupMergeRestore() 
throws Exception {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    int ADD_ROWS = 99;<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>    // #1 - create full backup for all 
tables<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    LOG.info("create full backup image 
for all tables");<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>    List&lt;TableName&gt; tables = 
Lists.newArrayList(table1, table2);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    // Set custom Merge Job 
implementation<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>    Connection conn = 
ConnectionFactory.createConnection(conf1);<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>    HBaseAdmin admin = (HBaseAdmin) 
conn.getAdmin();<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    BackupAdminImpl client = new 
BackupAdminImpl(conn);<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>    BackupRequest request = 
createBackupRequest(BackupType.FULL, tables, BACKUP_ROOT_DIR);<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>    String backupIdFull = 
client.backupTables(request);<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>    
assertTrue(checkSucceeded(backupIdFull));<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>    // #2 - insert some data to table1<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>    HTable t1 = insertIntoTable(conn, 
table1, famName, 1, ADD_ROWS);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    LOG.debug("writing " + ADD_ROWS + " 
rows to " + table1);<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>    
Assert.assertEquals(TEST_UTIL.countRows(t1), NB_ROWS_IN_BATCH + ADD_ROWS);<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    t1.close();<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    LOG.debug("written " + ADD_ROWS + " 
rows to " + table1);<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>    HTable t2 = insertIntoTable(conn, 
table2, famName, 1, ADD_ROWS);<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>    
Assert.assertEquals(TEST_UTIL.countRows(t2), NB_ROWS_IN_BATCH + ADD_ROWS);<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>    t2.close();<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    LOG.debug("written " + ADD_ROWS + " 
rows to " + table2);<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span>    // #3 - incremental backup for 
multiple tables<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    tables = Lists.newArrayList(table1, 
table2);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    request = 
createBackupRequest(BackupType.INCREMENTAL, tables, BACKUP_ROOT_DIR);<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>    String backupIdIncMultiple = 
client.backupTables(request);<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>    
assertTrue(checkSucceeded(backupIdIncMultiple));<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>    t1 = insertIntoTable(conn, table1, 
famName, 2, ADD_ROWS);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    t1.close();<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span>    t2 = insertIntoTable(conn, table2, 
famName, 2, ADD_ROWS);<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    t2.close();<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>    // #3 - incremental backup for 
multiple tables<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    request = 
createBackupRequest(BackupType.INCREMENTAL, tables, BACKUP_ROOT_DIR);<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    String backupIdIncMultiple2 = 
client.backupTables(request);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    
assertTrue(checkSucceeded(backupIdIncMultiple2));<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>    try (BackupAdmin bAdmin = new 
BackupAdminImpl(conn)) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      String[] backups = new String[] { 
backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      bAdmin.mergeBackups(backups);<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>    // #6 - restore incremental backup 
for multiple tables, with overwrite<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    TableName[] tablesRestoreIncMultiple 
= new TableName[] { table1, table2 };<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    TableName[] tablesMapIncMultiple = 
new TableName[] { table1_restore, table2_restore };<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    
client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, 
backupIdIncMultiple2, false,<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      tablesRestoreIncMultiple, 
tablesMapIncMultiple, true));<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>    Table hTable = 
conn.getTable(table1_restore);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    LOG.debug("After incremental restore: 
" + hTable.getTableDescriptor());<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    int countRows = 
TEST_UTIL.countRows(hTable, famName);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    LOG.debug("f1 has " + countRows + " 
rows");<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    Assert.assertEquals(NB_ROWS_IN_BATCH 
+ 2 * ADD_ROWS, countRows);<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>    hTable.close();<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>    hTable = 
conn.getTable(table2_restore);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    
Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 2 * 
ADD_ROWS);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    hTable.close();<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>    admin.close();<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    conn.close();<a name="line.130"></a>
+<span class="sourceLineNo">131</span>  }<a name="line.131"></a>
+<span class="sourceLineNo">132</span>}<a name="line.132"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

Reply via email to