Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BD7471931F for ; Mon, 18 Apr 2016 16:52:01 +0000 (UTC) Received: (qmail 6384 invoked by uid 500); 18 Apr 2016 16:52:01 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 6344 invoked by uid 500); 18 Apr 2016 16:52:01 -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 6335 invoked by uid 99); 18 Apr 2016 16:52:01 -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; Mon, 18 Apr 2016 16:52:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6634DDFD43; Mon, 18 Apr 2016 16:52:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ashishsinghi@apache.org To: commits@hbase.apache.org Message-Id: <05629a01a7e0428e9034cac314d38e30@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15668 HFileReplicator fails to replicate other hfiles in the request when a hfile in not found in FS anywhere Date: Mon, 18 Apr 2016 16:52:01 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1.3 87d8c8863 -> 5fa78dd48 HBASE-15668 HFileReplicator fails to replicate other hfiles in the request when a hfile in not found in FS anywhere Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5fa78dd4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5fa78dd4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5fa78dd4 Branch: refs/heads/branch-1.3 Commit: 5fa78dd483e16a19a13096116aa63b6f35af0f79 Parents: 87d8c88 Author: Ashish Singhi Authored: Mon Apr 18 22:17:02 2016 +0530 Committer: Ashish Singhi Committed: Mon Apr 18 22:19:04 2016 +0530 ---------------------------------------------------------------------- .../hadoop/hbase/replication/regionserver/HFileReplicator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5fa78dd4/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HFileReplicator.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HFileReplicator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HFileReplicator.java index 17f6780..1a1044d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HFileReplicator.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HFileReplicator.java @@ -378,11 +378,11 @@ public class HFileReplicator { FileUtil.copy(sourceFs, sourceHFilePath, sinkFs, localHFilePath, false, conf); } catch (FileNotFoundException e1) { // This will mean that the hfile does not exists any where in source cluster FS. So we - // cannot do anything here just log and return. + // cannot do anything here just log and continue. LOG.error("Failed to copy hfile from " + sourceHFilePath + " to " + localHFilePath + ". Hence ignoring this hfile from replication..", e1); - return null; + continue; } } sinkFs.setPermission(localHFilePath, PERM_ALL_ACCESS);