From 3f5d2afb0eadf2a169d4bef3b4ce0c15a5d59ccf Mon Sep 17 00:00:00 2001 From: chaiwentao Date: Fri, 5 Apr 2019 23:56:00 +0800 Subject: [PATCH] fixed a bug of checking if restoreDir is subDir of rootDir, when copySnapshotForScanner --- .../org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java | 2 +- 1 file changed, 1 insertion(+), 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 index 0b29b8a9fc..574416ea77 100644 --- 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 @@ -827,7 +827,7 @@ public class RestoreSnapshotHelper { 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); } -- 2.17.2 (Apple Git-113)