Repository: hive Updated Branches: refs/heads/master 818569f6d -> 94ec36865
HIVE-20228: configure repl configuration directories based on user running hiveserver2 (Anishek Agarwal, reviewed by Sankar Hariappan) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/94ec3686 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/94ec3686 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/94ec3686 Branch: refs/heads/master Commit: 94ec3686552dc081c1a8c7aa93a13c3b339c6864 Parents: 818569f Author: Anishek Agarwal <[email protected]> Authored: Fri Jul 27 12:39:44 2018 +0530 Committer: Anishek Agarwal <[email protected]> Committed: Fri Jul 27 12:39:44 2018 +0530 ---------------------------------------------------------------------- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java | 6 +++--- .../org/apache/hadoop/hive/metastore/conf/MetastoreConf.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/94ec3686/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 15217e7..9f1da60 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -438,11 +438,11 @@ public class HiveConf extends Configuration { "HDFS root scratch dir for Hive jobs which gets created with write all (733) permission. " + "For each connecting user, an HDFS scratch dir: ${hive.exec.scratchdir}/<username> is created, " + "with ${hive.scratch.dir.permission}."), - REPLDIR("hive.repl.rootdir","/user/hive/repl/", + REPLDIR("hive.repl.rootdir","/user/${system:user.name}/repl/", "HDFS root dir for all replication dumps."), REPLCMENABLED("hive.repl.cm.enabled", false, "Turn on ChangeManager, so delete files will go to cmrootdir."), - REPLCMDIR("hive.repl.cmrootdir","/user/hive/cmroot/", + REPLCMDIR("hive.repl.cmrootdir","/user/${system:user.name}/cmroot/", "Root dir for ChangeManager, used for deleted files."), REPLCMRETIAN("hive.repl.cm.retain","24h", new TimeValidator(TimeUnit.HOURS), @@ -450,7 +450,7 @@ public class HiveConf extends Configuration { REPLCMINTERVAL("hive.repl.cm.interval","3600s", new TimeValidator(TimeUnit.SECONDS), "Inteval for cmroot cleanup thread."), - REPL_FUNCTIONS_ROOT_DIR("hive.repl.replica.functions.root.dir","/user/hive/repl/functions/", + REPL_FUNCTIONS_ROOT_DIR("hive.repl.replica.functions.root.dir","/user/${system:user.name}/repl/functions/", "Root directory on the replica warehouse where the repl sub-system will store jars from the primary warehouse"), REPL_APPROX_MAX_LOAD_TASKS("hive.repl.approx.max.load.tasks", 10000, "Provide an approximation of the maximum number of tasks that should be executed before \n" http://git-wip-us.apache.org/repos/asf/hive/blob/94ec3686/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java index 7b32c08..5791375 100644 --- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java @@ -652,7 +652,7 @@ public class MetastoreConf { "org.apache.hadoop.hive.metastore.ObjectStore", "Name of the class that implements org.apache.riven.rawstore interface. \n" + "This class is used to store and retrieval of raw metadata objects such as table, database"), - REPLCMDIR("metastore.repl.cmrootdir", "hive.repl.cmrootdir", "/user/hive/cmroot/", + REPLCMDIR("metastore.repl.cmrootdir", "hive.repl.cmrootdir", "/user/${system:user.name}/cmroot/", "Root dir for ChangeManager, used for deleted files."), REPLCMRETIAN("metastore.repl.cm.retain", "hive.repl.cm.retain", 24, TimeUnit.HOURS, "Time to retain removed files in cmrootdir."), @@ -660,7 +660,7 @@ public class MetastoreConf { "Inteval for cmroot cleanup thread."), REPLCMENABLED("metastore.repl.cm.enabled", "hive.repl.cm.enabled", false, "Turn on ChangeManager, so delete files will go to cmrootdir."), - REPLDIR("metastore.repl.rootdir", "hive.repl.rootdir", "/user/hive/repl/", + REPLDIR("metastore.repl.rootdir", "hive.repl.rootdir", "/user/${system:user.name}/repl/", "HDFS root dir for all replication dumps."), REPL_COPYFILE_MAXNUMFILES("metastore.repl.copyfile.maxnumfiles", "hive.exec.copyfile.maxnumfiles", 1L,
