You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by je...@apache.org on 2016/07/20 20:34:53 UTC
hbase git commit: HBASE-13701 Consolidate SecureBulkLoadEndpoint into
HBase core as default for bulk load -- addendum
Repository: hbase
Updated Branches:
refs/heads/master 70f330dc8 -> ce657d591
HBASE-13701 Consolidate SecureBulkLoadEndpoint into HBase core as default for bulk load -- addendum
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ce657d59
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ce657d59
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ce657d59
Branch: refs/heads/master
Commit: ce657d591114d1dab4aa4cf65698dfbae29406e3
Parents: 70f330d
Author: Jerry He <je...@apache.org>
Authored: Wed Jul 20 13:28:01 2016 -0700
Committer: Jerry He <je...@apache.org>
Committed: Wed Jul 20 13:28:01 2016 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ce657d59/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 c04794b..09dedec 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
@@ -818,7 +818,7 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
Path hfileStagingPath = null;
Path hfileOrigPath = new Path(el.getSecond());
try {
- hfileStagingPath= new Path(secureClient.getStagingPath(bulkToken, el.getFirst()),
+ hfileStagingPath= new Path(new Path(bulkToken, Bytes.toString(el.getFirst())),
hfileOrigPath.getName());
if(targetFs.rename(hfileStagingPath, hfileOrigPath)) {
LOG.debug("Moved back file " + hfileOrigPath + " from " +