This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push: new 48e8e50 HDDS-3927. Rename Ozone OM,DN,SCM runtime options to conform to naming conventions (#1401) 48e8e50 is described below commit 48e8e5047bc5a0075904e9142666b67a32b0da91 Author: Siyao Meng <50227127+smen...@users.noreply.github.com> AuthorDate: Sun Sep 13 13:09:50 2020 -0700 HDDS-3927. Rename Ozone OM,DN,SCM runtime options to conform to naming conventions (#1401) --- hadoop-hdds/common/src/main/conf/hadoop-env.sh | 13 +++++++++++-- .../dist/src/main/compose/ozone-topology/docker-config | 4 ++-- hadoop-ozone/dist/src/shell/ozone/ozone | 13 ++++++------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/hadoop-hdds/common/src/main/conf/hadoop-env.sh b/hadoop-hdds/common/src/main/conf/hadoop-env.sh index 51ee585..07f2ed8 100644 --- a/hadoop-hdds/common/src/main/conf/hadoop-env.sh +++ b/hadoop-hdds/common/src/main/conf/hadoop-env.sh @@ -400,7 +400,16 @@ export HADOOP_OS_TYPE=${HADOOP_OS_TYPE:-$(uname -s)} # 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_OM_OPTS="" +# export OZONE_OM_OPTS="" + +### +# Ozone DataNode specific parameters +### +# Specify the JVM options to be used when starting Ozone DataNodes. +# These options will be appended to the options specified as HADOOP_OPTS +# and therefore may override any similar flags set in HADOOP_OPTS +# +# export OZONE_DATANODE_OPTS="" ### # HDFS StorageContainerManager specific parameters @@ -409,7 +418,7 @@ export HADOOP_OS_TYPE=${HADOOP_OS_TYPE:-$(uname -s)} # 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="" +# export OZONE_SCM_OPTS="" ### # Advanced Users Only! diff --git a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config index 648a858..6e93594 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone-topology/docker-config @@ -38,8 +38,8 @@ OZONE-SITE.XML_ozone.network.topology.aware.read=true HDFS-SITE.XML_rpc.metrics.quantile.enable=true HDFS-SITE.XML_rpc.metrics.percentiles.intervals=60,300 ASYNC_PROFILER_HOME=/opt/profiler -HDDS_DN_OPTS=-Dmodule.name=datanode -HDFS_OM_OPTS=-Dmodule.name=om +OZONE_DATANODE_OPTS=-Dmodule.name=datanode +OZONE_MANAGER_OPTS=-Dmodule.name=om HDFS_STORAGECONTAINERMANAGER_OPTS=-Dmodule.name=scm HDFS_OM_SH_OPTS=-Dmodule.name=sh HDFS_SCM_CLI_OPTS=-Dmodule.name=admin diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone b/hadoop-ozone/dist/src/shell/ozone/ozone index c536484..13a416a 100755 --- a/hadoop-ozone/dist/src/shell/ozone/ozone +++ b/hadoop-ozone/dist/src/shell/ozone/ozone @@ -105,8 +105,8 @@ function ozonecmd_case # Corresponding Ratis issue https://issues.apache.org/jira/browse/RATIS-534. # TODO: Fix the problem related to netty resource leak detector throwing # exception as mentioned in HDDS-3812 - HDDS_DN_OPTS="-Dorg.apache.ratis.thirdparty.io.netty.allocator.useCacheForAllThreads=false -Dorg.apache.ratis.thirdparty.io.netty.leakDetection.level=disabled -Dlog4j.configurationFile=${HADOOP_CONF_DIR}/dn-audit-log4j2.properties ${HDDS_DN_OPTS}" - HADOOP_OPTS="${HADOOP_OPTS} ${HDDS_DN_OPTS}" + hadoop_deprecate_envvar HDDS_DN_OPTS OZONE_DATANODE_OPTS + OZONE_DATANODE_OPTS="-Dorg.apache.ratis.thirdparty.io.netty.allocator.useCacheForAllThreads=false -Dorg.apache.ratis.thirdparty.io.netty.leakDetection.level=disabled -Dlog4j.configurationFile=${HADOOP_CONF_DIR}/dn-audit-log4j2.properties ${OZONE_DATANODE_OPTS}" HADOOP_CLASSNAME=org.apache.hadoop.ozone.HddsDatanodeService OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-datanode" ;; @@ -154,8 +154,8 @@ function ozonecmd_case om) HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" HADOOP_CLASSNAME=org.apache.hadoop.ozone.om.OzoneManagerStarter - HDFS_OM_OPTS="${HDFS_OM_OPTS} -Dlog4j.configurationFile=${HADOOP_CONF_DIR}/om-audit-log4j2.properties" - HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_OM_OPTS}" + hadoop_deprecate_envvar HDFS_OM_OPTS OZONE_OM_OPTS + OZONE_OM_OPTS="${OZONE_OM_OPTS} -Dlog4j.configurationFile=${HADOOP_CONF_DIR}/om-audit-log4j2.properties" OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-ozone-manager" ;; sh | shell) @@ -172,9 +172,8 @@ function ozonecmd_case scm) HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" HADOOP_CLASSNAME='org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter' - hadoop_debug "Appending HDFS_STORAGECONTAINERMANAGER_OPTS onto HADOOP_OPTS" - HDFS_STORAGECONTAINERMANAGER_OPTS="${HDFS_STORAGECONTAINERMANAGER_OPTS} -Dlog4j.configurationFile=${HADOOP_CONF_DIR}/scm-audit-log4j2.properties" - HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_STORAGECONTAINERMANAGER_OPTS}" + hadoop_deprecate_envvar HDFS_STORAGECONTAINERMANAGER_OPTS OZONE_SCM_OPTS + OZONE_SCM_OPTS="${OZONE_SCM_OPTS} -Dlog4j.configurationFile=${HADOOP_CONF_DIR}/scm-audit-log4j2.properties" OZONE_RUN_ARTIFACT_NAME="hadoop-hdds-server-scm" ;; s3g) --------------------------------------------------------------------- To unsubscribe, e-mail: ozone-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: ozone-commits-h...@hadoop.apache.org