hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ashishsin...@apache.org
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:44 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 ee78b6da7 -> 6d40b7a0e


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/6d40b7a0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6d40b7a0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6d40b7a0

Branch: refs/heads/branch-1
Commit: 6d40b7a0e4b8fb0bb3ada214e790aaf496070989
Parents: ee78b6d
Author: Ashish Singhi <ashish.singhi@huawei.com>
Authored: Mon Apr 18 22:17:02 2016 +0530
Committer: Ashish Singhi <ashish.singhi@huawei.com>
Committed: Mon Apr 18 22:18:46 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/6d40b7a0/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);


Mime
View raw message