HBASE-22070 Checking restoreDir in RestoreSnapshotHelper

Signed-off-by: Peter Somogyi <psomogyi@apache.org>
apache · Apr 6, 2019 · 06d97dc · 06d97dc
1 parent 72a5238
commit 06d97dc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java
@@ -729,7 +729,7 @@ public static RestoreMetaChanges copySnapshotForScanner(Configuration conf, File
       throw new IllegalArgumentException("Filesystems for restore directory and HBase root directory " +
           "should be the same");
     }
-    if (restoreDir.toUri().getPath().startsWith(rootDir.toUri().getPath())) {
+    if (restoreDir.toUri().getPath().startsWith(rootDir.toUri().getPath() +"/")) {
       throw new IllegalArgumentException("Restore directory cannot be a sub directory of HBase " +
           "root directory. RootDir: " + rootDir + ", restoreDir: " + restoreDir);
     }