You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/02/10 09:16:43 UTC
hbase git commit: HBASE-15129 Set default value for hbase.fs.tmp.dir
rather than fully depend on hbase-default.xml (Yu Li)
Repository: hbase
Updated Branches:
refs/heads/0.98 5d1c3c901 -> d94f45d90
HBASE-15129 Set default value for hbase.fs.tmp.dir rather than fully depend on hbase-default.xml (Yu Li)
Conflicts:
hbase-client/src/main/java/org/apache/hadoop/hbase/security/SecureBulkLoadUtil.java
Amending-Author: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d94f45d9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d94f45d9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d94f45d9
Branch: refs/heads/0.98
Commit: d94f45d90f7896b8cd6b883eaf08ab5fc9e17f5b
Parents: 5d1c3c9
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Feb 2 16:18:26 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Feb 10 00:12:32 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/security/SecureBulkLoadUtil.java | 8 ++++++--
.../src/main/java/org/apache/hadoop/hbase/HConstants.java | 5 +++++
.../apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java | 5 ++++-
.../hadoop/hbase/mapreduce/TestHFileOutputFormat2.java | 3 ++-
4 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d94f45d9/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SecureBulkLoadUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SecureBulkLoadUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SecureBulkLoadUtil.java
index 04bfbb5..5af6891 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SecureBulkLoadUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SecureBulkLoadUtil.java
@@ -18,9 +18,10 @@
*/
package org.apache.hadoop.hbase.security;
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.util.Bytes;
@InterfaceAudience.Private
@@ -37,6 +38,9 @@ public class SecureBulkLoadUtil {
}
public static Path getBaseStagingDir(Configuration conf) {
- return new Path(conf.get(BULKLOAD_STAGING_DIR));
+ String hbaseTmpFsDir =
+ conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,
+ HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);
+ return new Path(conf.get(BULKLOAD_STAGING_DIR, hbaseTmpFsDir));
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/d94f45d9/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
index 4f54c33..ad33ff9 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
@@ -1149,6 +1149,11 @@ public final class HConstants {
public static final String ALLOW_LEGACY_OBJECT_SERIALIZATION_KEY =
"hbase.allow.legacy.object.serialization";
+ /** Config key for hbase temporary directory in hdfs */
+ public static final String TEMPORARY_FS_DIRECTORY_KEY = "hbase.fs.tmp.dir";
+ public static final String DEFAULT_TEMPORARY_HDFS_DIRECTORY = "/user/"
+ + System.getProperty("user.name") + "/hbase-staging";
+
private HConstants() {
// Can't be instantiated with this ctor.
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/d94f45d9/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index 46fd1f5..579ed56 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -612,7 +612,10 @@ public class HFileOutputFormat2
Configuration conf = job.getConfiguration();
// create the partitions file
FileSystem fs = FileSystem.get(conf);
- Path partitionsPath = new Path(conf.get("hbase.fs.tmp.dir"), "partitions_" + UUID.randomUUID());
+ String hbaseTmpFsDir =
+ conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,
+ HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);
+ Path partitionsPath = new Path(hbaseTmpFsDir, "partitions_" + UUID.randomUUID());
fs.makeQualified(partitionsPath);
writePartitions(conf, partitionsPath, splitPoints);
fs.deleteOnExit(partitionsPath);
http://git-wip-us.apache.org/repos/asf/hbase/blob/d94f45d9/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
index bff8494..8a4048a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
@@ -333,7 +333,8 @@ public class TestHFileOutputFormat2 {
@Test
public void testJobConfiguration() throws Exception {
Configuration conf = new Configuration(this.util.getConfiguration());
- conf.set("hbase.fs.tmp.dir", util.getDataTestDir("testJobConfiguration").toString());
+ conf.set(HConstants.TEMPORARY_FS_DIRECTORY_KEY, util.getDataTestDir("testJobConfiguration")
+ .toString());
Job job = new Job(conf);
job.setWorkingDirectory(util.getDataTestDir("testJobConfiguration"));
HTable table = Mockito.mock(HTable.class);