HDFS-11972. CBlocks use wrong OPT env vars. Contributed by Mukul Kumar Singh.

hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh

@@ -395,6 +395,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!
 ###

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)