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 e630e8819a..4a8bc1f58d 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 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal "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}/ 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 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal 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" 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 c2bbba5813..8d23dcaf6c 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 static ConfVars getMetaConf(String name) { "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 static ConfVars getMetaConf(String name) { "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,