From commits-return-72825-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Thu May 17 11:34:44 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 33B6418077A for ; Thu, 17 May 2018 11:34:44 +0200 (CEST) Received: (qmail 27209 invoked by uid 500); 17 May 2018 09:34:43 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 26664 invoked by uid 99); 17 May 2018 09:34:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 May 2018 09:34:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 88DFEE0A44; Thu, 17 May 2018 09:34:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhangduo@apache.org To: commits@hbase.apache.org Date: Thu, 17 May 2018 09:34:43 -0000 Message-Id: <57a4e84cecdc47a787b35b1b069dffe5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/36] hbase git commit: HBASE-20547 Restore from backup will fail if done from a different file system HBASE-20547 Restore from backup will fail if done from a different file system Signed-off-by: tedyu Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6d656b7e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6d656b7e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6d656b7e Branch: refs/heads/HBASE-19064 Commit: 6d656b7e71e38c32a65026df6196108e6a60ca0a Parents: 438af9b Author: Vladimir Rodionov Authored: Tue May 15 12:10:40 2018 -0700 Committer: tedyu Committed: Wed May 16 09:55:19 2018 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/backup/impl/IncrementalTableBackupClient.java | 1 + .../java/org/apache/hadoop/hbase/backup/util/BackupUtils.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6d656b7e/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java index 8fd6573..43824d7 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java @@ -361,6 +361,7 @@ public class IncrementalTableBackupClient extends TableBackupClient { protected void deleteBulkLoadDirectory() throws IOException { // delete original bulk load directory on method exit Path path = getBulkOutputDir(); + FileSystem fs = FileSystem.get(path.toUri(), conf); boolean result = fs.delete(path, true); if (!result) { LOG.warn("Could not delete " + path); http://git-wip-us.apache.org/repos/asf/hbase/blob/6d656b7e/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java index 96ecab9..e01849a 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java @@ -563,7 +563,8 @@ public final class BackupUtils { private static List getHistory(Configuration conf, Path backupRootPath) throws IOException { // Get all (n) history from backup root destination - FileSystem fs = FileSystem.get(conf); + + FileSystem fs = FileSystem.get(backupRootPath.toUri(), conf); RemoteIterator it = fs.listLocatedStatus(backupRootPath); List infos = new ArrayList<>();