svn commit: r1593771 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java

[mb...@apache.org]

Author: mbertozzi
Date: Sun May 11 10:57:33 2014
New Revision: 1593771

URL: http://svn.apache.org/r1593771
Log:
HBASE-11133 Add an option to skip snapshot verification after ExportSnapshot

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java?rev=1593771&r1=1593770&r2=1593771&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java Sun May 11 10:57:33 2014
@@ -685,6 +685,7 @@ public final class ExportSnapshot extend
    */
   @Override
   public int run(String[] args) throws IOException {
+    boolean verifyTarget = true;
     boolean verifyChecksum = true;
     String snapshotName = null;
     boolean overwrite = false;
@@ -712,6 +713,8 @@ public final class ExportSnapshot extend
           FSUtils.setRootDir(conf, sourceDir);
         } else if (cmd.equals("-no-checksum-verify")) {
           verifyChecksum = false;
+        } else if (cmd.equals("-no-target-verify")) {
+          verifyTarget = false;
         } else if (cmd.equals("-mappers")) {
           mappers = Integer.parseInt(args[++i]);
         } else if (cmd.equals("-chuser")) {
@@ -830,9 +833,11 @@ public final class ExportSnapshot extend
         }
       }
 
-      // Step 4 - Verify snapshot validity
-      LOG.info("Verify snapshot validity");
-      verifySnapshot(conf, outputFs, outputRoot, outputSnapshotDir);
+      // Step 4 - Verify snapshot integrity
+      if (verifyTarget) {
+        LOG.info("Verify snapshot integrity");
+        verifySnapshot(conf, outputFs, outputRoot, outputSnapshotDir);
+      }
 
       LOG.info("Export Completed: " + snapshotName);
       return 0;
@@ -854,7 +859,9 @@ public final class ExportSnapshot extend
     System.err.println("  -snapshot NAME          Snapshot to restore.");
     System.err.println("  -copy-to NAME           Remote destination hdfs://");
     System.err.println("  -copy-from NAME         Input folder hdfs:// (default hbase.rootdir)");
-    System.err.println("  -no-checksum-verify     Do not verify checksum.");
+    System.err.println("  -no-checksum-verify     Do not verify checksum, use name+length only.");
+    System.err.println("  -no-target-verify       Do not verify the integrity of the \\" +
+        "exported snapshot.");
     System.err.println("  -overwrite              Rewrite the snapshot manifest if already exists");
     System.err.println("  -chuser USERNAME        Change the owner of the files " +
         "to the specified one.");