diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone b/hadoop-ozone/dist/src/shell/ozone/ozone index b5a43c6c9b1e..4fe37de1d26b 100755 --- a/hadoop-ozone/dist/src/shell/ozone/ozone +++ b/hadoop-ozone/dist/src/shell/ozone/ozone @@ -108,7 +108,7 @@ function ozonecmd_case OZONE_SUBCMD_SUPPORTDAEMONIZATION="true" ozone_deprecate_envvar HDDS_DN_OPTS OZONE_DATANODE_OPTS OZONE_DATANODE_OPTS="${RATIS_OPTS} ${OZONE_DATANODE_OPTS}" - OZONE_DATANODE_OPTS="-Dlog4j.configurationFile=${OZONE_CONF_DIR}/dn-audit-log4j2.properties,${OZONE_CONF_DIR}/dn-container-log4j2.properties ${OZONE_DATANODE_OPTS}" + OZONE_DATANODE_OPTS="-Dlog4j.configurationFile=${OZONE_CONF_DIR}/dn-audit-log4j2.properties,${OZONE_CONF_DIR}/dn-container-log4j2.properties -Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties ${OZONE_DATANODE_OPTS}" OZONE_DATANODE_OPTS="${OZONE_DATANODE_OPTS} ${OZONE_MODULE_ACCESS_ARGS}" OZONE_CLASSNAME=org.apache.hadoop.ozone.HddsDatanodeService OZONE_RUN_ARTIFACT_NAME="ozone-datanode" @@ -139,7 +139,7 @@ function ozonecmd_case OZONE_CLASSNAME=org.apache.hadoop.ozone.om.OzoneManagerStarter ozone_deprecate_envvar HDFS_OM_OPTS OZONE_OM_OPTS OZONE_OM_OPTS="${RATIS_OPTS} ${OZONE_OM_OPTS}" - OZONE_OM_OPTS="${OZONE_OM_OPTS} -Dlog4j.configurationFile=${OZONE_CONF_DIR}/om-audit-log4j2.properties" + OZONE_OM_OPTS="${OZONE_OM_OPTS} -Dlog4j.configurationFile=${OZONE_CONF_DIR}/om-audit-log4j2.properties -Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties" OZONE_OM_OPTS="${OZONE_OM_OPTS} ${OZONE_MODULE_ACCESS_ARGS}" OZONE_RUN_ARTIFACT_NAME="ozone-manager" ;; @@ -158,19 +158,19 @@ function ozonecmd_case OZONE_CLASSNAME='org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter' ozone_deprecate_envvar HDFS_STORAGECONTAINERMANAGER_OPTS OZONE_SCM_OPTS OZONE_SCM_OPTS="${RATIS_OPTS} ${OZONE_SCM_OPTS}" - OZONE_SCM_OPTS="${OZONE_SCM_OPTS} -Dlog4j.configurationFile=${OZONE_CONF_DIR}/scm-audit-log4j2.properties" + OZONE_SCM_OPTS="${OZONE_SCM_OPTS} -Dlog4j.configurationFile=${OZONE_CONF_DIR}/scm-audit-log4j2.properties -Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties" OZONE_SCM_OPTS="${OZONE_SCM_OPTS} ${OZONE_MODULE_ACCESS_ARGS}" OZONE_RUN_ARTIFACT_NAME="hdds-server-scm" ;; s3g) OZONE_SUBCMD_SUPPORTDAEMONIZATION="true" OZONE_CLASSNAME='org.apache.hadoop.ozone.s3.Gateway' - OZONE_S3G_OPTS="${OZONE_S3G_OPTS} ${RATIS_OPTS} -Dlog4j.configurationFile=${OZONE_CONF_DIR}/s3g-audit-log4j2.properties ${OZONE_MODULE_ACCESS_ARGS}" + OZONE_S3G_OPTS="${OZONE_S3G_OPTS} ${RATIS_OPTS} -Dlog4j.configurationFile=${OZONE_CONF_DIR}/s3g-audit-log4j2.properties -Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties ${OZONE_MODULE_ACCESS_ARGS}" OZONE_RUN_ARTIFACT_NAME="ozone-s3gateway" ;; httpfs) OZONE_SUBCMD_SUPPORTDAEMONIZATION="true" - OZONE_OPTS="${OZONE_OPTS} ${RATIS_OPTS} -Dhttpfs.home.dir=${OZONE_HOME} -Dhttpfs.config.dir=${OZONE_CONF_DIR} -Dhttpfs.log.dir=${OZONE_HOME}/log -Dhttpfs.temp.dir=${OZONE_HOME}/temp ${OZONE_MODULE_ACCESS_ARGS}" + OZONE_OPTS="${OZONE_OPTS} ${RATIS_OPTS} -Dhttpfs.home.dir=${OZONE_HOME} -Dhttpfs.config.dir=${OZONE_CONF_DIR} -Dhttpfs.log.dir=${OZONE_HOME}/log -Dhttpfs.temp.dir=${OZONE_HOME}/temp -Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties ${OZONE_MODULE_ACCESS_ARGS}" OZONE_CLASSNAME='org.apache.ozone.fs.http.server.HttpFSServerWebServer' OZONE_RUN_ARTIFACT_NAME="ozone-httpfsgateway" ;; @@ -181,12 +181,13 @@ function ozonecmd_case csi) OZONE_SUBCMD_SUPPORTDAEMONIZATION="true" OZONE_CLASSNAME='org.apache.hadoop.ozone.csi.CsiServer' + OZONE_CSI_OPTS="${OZONE_CSI_OPTS} -Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties" OZONE_RUN_ARTIFACT_NAME="ozone-csi" ;; recon) OZONE_SUBCMD_SUPPORTDAEMONIZATION="true" OZONE_CLASSNAME='org.apache.hadoop.ozone.recon.ReconServer' - OZONE_RECON_OPTS="${OZONE_RECON_OPTS} ${RATIS_OPTS} ${OZONE_MODULE_ACCESS_ARGS}" + OZONE_RECON_OPTS="${OZONE_RECON_OPTS} ${RATIS_OPTS} -Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties ${OZONE_MODULE_ACCESS_ARGS}" OZONE_RUN_ARTIFACT_NAME="ozone-recon" ;; fs)