You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/11/03 23:44:30 UTC
git commit: HBASE-12406 Bulk load fails in 0.98 against hadoop-1 due
to unmatched family name
Repository: hbase
Updated Branches:
refs/heads/0.98 ce186df86 -> 632c286e0
HBASE-12406 Bulk load fails in 0.98 against hadoop-1 due to unmatched family name
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/632c286e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/632c286e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/632c286e
Branch: refs/heads/0.98
Commit: 632c286e08d5944d33e49c4614396949891eddc1
Parents: ce186df
Author: tedyu <yu...@gmail.com>
Authored: Mon Nov 3 14:44:17 2014 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Mon Nov 3 14:44:17 2014 -0800
----------------------------------------------------------------------
.../hadoop/hbase/mapreduce/LoadIncrementalHFiles.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/632c286e/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
index bd64924..645c9fb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
@@ -200,6 +200,12 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
continue;
}
Path familyDir = stat.getPath();
+ if (familyDir.getName().equals("_logs")) {
+ // Family name of "_logs" is not supported.
+ // This is due to the presence of history directory under _logs directory
+ // when hadoop-1 is used
+ continue;
+ }
byte[] family = familyDir.getName().getBytes();
Path[] hfiles = FileUtil.stat2Paths(fs.listStatus(familyDir));
for (Path hfile : hfiles) {
@@ -835,6 +841,12 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
continue;
}
Path familyDir = stat.getPath();
+ if (familyDir.getName().equals("_logs")) {
+ // Family name of "_logs" is not supported.
+ // This is due to the presence of history directory under _logs directory
+ // when hadoop-1 is used
+ continue;
+ }
byte[] family = familyDir.getName().getBytes();
hcd = new HColumnDescriptor(family);