From 0c139d5bcfbcd62fc69111ee6204926c57d57bf1 Mon Sep 17 00:00:00 2001 From: Wei Yan Date: Thu, 25 Jan 2018 11:36:28 -0800 Subject: [PATCH] HDFS-13049. RBF: Inconsistent Router OPTS config in branch-2 and branch-3. Contributed by Wei Yan. --- .../hadoop-common/src/main/conf/hadoop-env.cmd | 9 +++++++++ .../hadoop-common/src/main/conf/hadoop-env.sh | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd index 5dbd635d1d..159840a104 100644 --- a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd +++ b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd @@ -70,6 +70,15 @@ set HADOOP_SECURE_DN_USER=%HADOOP_SECURE_DN_USER% @rem Where log files are stored in the secure data environment. set HADOOP_SECURE_DN_LOG_DIR=%HADOOP_LOG_DIR%\%HADOOP_HDFS_USER% +@rem +@rem Router-based HDFS Federation specific parameters +@rem Specify the JVM options to be used when starting the RBF Routers. +@rem These options will be appended to the options specified as HADOOP_OPTS +@rem and therefore may override any similar flags set in HADOOP_OPTS +@rem +@rem set HADOOP_DFSROUTER_OPTS="" +@rem + @rem The directory where pid files are stored. /tmp by default. @rem NOTE: this should be set to a directory that can only be written to by @rem the user that will run the hadoop daemons. Otherwise there is the diff --git a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh index bef4dab96d..24aacdfe1c 100644 --- a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh +++ b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh @@ -395,6 +395,15 @@ esac # # export HDFS_MOVER_OPTS="" +### +# Router-based HDFS Federation specific parameters +# Specify the JVM options to be used when starting the RBF Routers. +# These options will be appended to the options specified as HADOOP_OPTS +# and therefore may override any similar flags set in HADOOP_OPTS +# +# export HDFS_DFSROUTER_OPTS="" +### + ### # Advanced Users Only! ###