Repository: hadoop Updated Branches: refs/heads/HDFS-7240 bf08dc315 -> ee4f021fb
HDFS-11972. CBlocks use wrong OPT env vars. Contributed by Mukul Kumar Singh. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ee4f021f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ee4f021f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ee4f021f Branch: refs/heads/HDFS-7240 Commit: ee4f021fbce3cb639eef38b4c88f0622ebee6234 Parents: bf08dc3 Author: Anu Engineer <[email protected]> Authored: Sat Sep 23 12:40:21 2017 -0700 Committer: Anu Engineer <[email protected]> Committed: Sat Sep 23 12:40:21 2017 -0700 ---------------------------------------------------------------------- .../hadoop-common/src/main/conf/hadoop-env.sh | 36 ++++++++++++++++++++ .../hadoop-hdfs/src/main/bin/hdfs | 16 ++++----- 2 files changed, 44 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ee4f021f/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh ---------------------------------------------------------------------- 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 bef4dab..1c5a19c 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 @@ -396,6 +396,42 @@ esac # export HDFS_MOVER_OPTS="" ### +# HDFS CBlock Server specific parameters +### +# Specify the JVM options to be used when starting the HDFS CBlock Server. +# 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_CBLOCKSERVER_OPTS="" + +### +# HDFS JSCSI specific parameters +### +# Specify the JVM options to be used when starting the HDFS JSCSI. +# 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_JSCSI_OPTS="" + +### +# HDFS Key Space Manager specific parameters +### +# Specify the JVM options to be used when starting the HDFS Key Space Manager. +# 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_KEYSPACEMANAGER_OPTS="" + +### +# HDFS StorageContainerManager specific parameters +### +# Specify the JVM options to be used when starting the HDFS Storage Container Manager. +# 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_STORAGECONTAINERMANAGER_OPTS="" + +### # Advanced Users Only! ### http://git-wip-us.apache.org/repos/asf/hadoop/blob/ee4f021f/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs index 61e4808..019f17c 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs @@ -99,8 +99,8 @@ function hdfscmd_case cblockserver) HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" HADOOP_CLASSNAME=org.apache.hadoop.cblock.CBlockManager - hadoop_debug "Appending HADOOP_CBLOCK_OPTS onto HADOOP_OPTS" - HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_CBLOCK_OPTS}" + hadoop_debug "Appending HDFS_CBLOCKSERVER_OPTS onto HADOOP_OPTS" + HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_CBLOCKSERVER_OPTS}" ;; classpath) hadoop_do_classpath_subcommand HADOOP_CLASSNAME "$@" @@ -166,8 +166,8 @@ function hdfscmd_case jscsi) HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" HADOOP_CLASSNAME=org.apache.hadoop.cblock.jscsiHelper.SCSITargetDaemon - hadoop_debug "Appending HADOOP_JSCSI_OPTS onto HADOOP_OPTS" - HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_JSCSI_OPTS}" + hadoop_debug "Appending HDFS_JSCSI_OPTS onto HADOOP_OPTS" + HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_JSCSI_OPTS}" ;; jmxget) HADOOP_CLASSNAME=org.apache.hadoop.hdfs.tools.JMXGet @@ -175,8 +175,8 @@ function hdfscmd_case ksm) HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" HADOOP_CLASSNAME=org.apache.hadoop.ozone.ksm.KeySpaceManager - hadoop_debug "Appending HADOOP_KSM_OPTS onto HADOOP_OPTS" - HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_KSM_OPTS}" + hadoop_debug "Appending HDFS_KEYSPACEMANAGER_OPTS onto HADOOP_OPTS" + HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_KEYSPACEMANAGER_OPTS}" ;; lsSnapshottableDir) HADOOP_CLASSNAME=org.apache.hadoop.hdfs.tools.snapshot.LsSnapshottableDir @@ -222,8 +222,8 @@ function hdfscmd_case else HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" HADOOP_CLASSNAME='org.apache.hadoop.ozone.scm.StorageContainerManager' - hadoop_debug "Appending HADOOP_SCM_OPTS onto HADOOP_OPTS" - HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_SCM_OPTS}" + hadoop_debug "Appending HDFS_STORAGECONTAINERMANAGER_OPTS onto HADOOP_OPTS" + HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_STORAGECONTAINERMANAGER_OPTS}" fi ;; secondarynamenode) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
