This is an automated email from the ASF dual-hosted git repository.
sarvekshayr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new b974be35847 HDDS-15732. Some ozone commands ignore
OZONE_MODULE_ACCESS_ARGS (#10655)
b974be35847 is described below
commit b974be35847136f474caca3bd9ffde2b0cdcd860
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Jul 6 06:22:53 2026 +0200
HDDS-15732. Some ozone commands ignore OZONE_MODULE_ACCESS_ARGS (#10655)
---
hadoop-ozone/dist/src/shell/ozone/ozone | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone
b/hadoop-ozone/dist/src/shell/ozone/ozone
index 073748be214..72712191068 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone
@@ -97,6 +97,8 @@ function ozonecmd_case
# Corresponding Ratis issue https://issues.apache.org/jira/browse/RATIS-534.
RATIS_OPTS="-Dorg.apache.ratis.thirdparty.io.netty.allocator.useCacheForAllThreads=false
${RATIS_OPTS}"
+ OZONE_OPTS="${RATIS_OPTS} ${OZONE_MODULE_ACCESS_ARGS} ${OZONE_OPTS}"
+
case ${subcmd} in
classpath)
if [[ "$#" -gt 0 ]]; then
@@ -121,9 +123,7 @@ function ozonecmd_case
datanode)
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
-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"
;;
@@ -141,7 +141,6 @@ function ozonecmd_case
;;
freon)
OZONE_CLASSNAME=org.apache.hadoop.ozone.freon.Freon
- OZONE_FREON_OPTS="${OZONE_FREON_OPTS} ${RATIS_OPTS}
${OZONE_MODULE_ACCESS_ARGS}"
OZONE_RUN_ARTIFACT_NAME="ozone-freon"
if ozone_is_freon_command_moved_to_vapor; then
# backward compatibility
@@ -157,15 +156,12 @@ function ozonecmd_case
OZONE_SUBCMD_SUPPORTDAEMONIZATION="true"
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
-Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties"
- OZONE_OM_OPTS="${OZONE_OM_OPTS} ${OZONE_MODULE_ACCESS_ARGS}"
OZONE_RUN_ARTIFACT_NAME="ozone-manager"
;;
- sh | shell)
+ sh)
OZONE_CLASSNAME=org.apache.hadoop.ozone.shell.OzoneShell
ozone_deprecate_envvar HDFS_OM_SH_OPTS OZONE_SH_OPTS
- OZONE_SH_OPTS="${OZONE_SH_OPTS} ${RATIS_OPTS}
${OZONE_MODULE_ACCESS_ARGS}"
OZONE_RUN_ARTIFACT_NAME="ozone-cli-shell"
;;
s3)
@@ -176,20 +172,18 @@ function ozonecmd_case
OZONE_SUBCMD_SUPPORTDAEMONIZATION="true"
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
-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
-Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties
${OZONE_MODULE_ACCESS_ARGS}"
+ OZONE_S3G_OPTS="${OZONE_S3G_OPTS}
-Dlog4j.configurationFile=${OZONE_CONF_DIR}/s3g-audit-log4j2.properties
-Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties"
OZONE_RUN_ARTIFACT_NAME="ozone-s3gateway"
;;
httpfs)
OZONE_SUBCMD_SUPPORTDAEMONIZATION="true"
- OZONE_HTTPFS_OPTS="${OZONE_HTTPFS_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_HTTPFS_OPTS="${OZONE_HTTPFS_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_CLASSNAME='org.apache.ozone.fs.http.server.HttpFSServerWebServer'
OZONE_RUN_ARTIFACT_NAME="ozone-httpfsgateway"
;;
@@ -206,12 +200,11 @@ function ozonecmd_case
recon)
OZONE_SUBCMD_SUPPORTDAEMONIZATION="true"
OZONE_CLASSNAME='org.apache.hadoop.ozone.recon.ReconServer'
- OZONE_RECON_OPTS="${OZONE_RECON_OPTS} ${RATIS_OPTS}
-Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties
${OZONE_MODULE_ACCESS_ARGS}"
+ OZONE_RECON_OPTS="${OZONE_RECON_OPTS}
-Dlog4j.configuration=file:${OZONE_CONF_DIR}/log4j.properties"
OZONE_RUN_ARTIFACT_NAME="ozone-recon"
;;
fs)
OZONE_CLASSNAME=org.apache.hadoop.fs.ozone.OzoneFsShell
- OZONE_FS_OPTS="${OZONE_FS_OPTS} ${RATIS_OPTS}
${OZONE_MODULE_ACCESS_ARGS}"
OZONE_RUN_ARTIFACT_NAME="ozone-tools"
;;
daemonlog)
@@ -237,22 +230,18 @@ function ozonecmd_case
interactive)
OZONE_CLASSNAME=org.apache.hadoop.ozone.shell.OzoneInteractiveShell
OZONE_RUN_ARTIFACT_NAME="ozone-cli-interactive"
- OZONE_OPTS="${OZONE_OPTS} ${RATIS_OPTS} ${OZONE_MODULE_ACCESS_ARGS}"
;;
admin)
OZONE_CLASSNAME=org.apache.hadoop.ozone.admin.OzoneAdmin
- OZONE_ADMIN_OPTS="${OZONE_ADMIN_OPTS} ${RATIS_OPTS}
${OZONE_MODULE_ACCESS_ARGS}"
OZONE_RUN_ARTIFACT_NAME="ozone-cli-admin"
;;
debug)
OZONE_CLASSNAME=org.apache.hadoop.ozone.debug.OzoneDebug
- OZONE_DEBUG_OPTS="${OZONE_DEBUG_OPTS} ${RATIS_OPTS}
${OZONE_MODULE_ACCESS_ARGS}"
OZONE_RUN_ARTIFACT_NAME="ozone-cli-debug"
;;
repair)
check_running_ozone_services
OZONE_CLASSNAME=org.apache.hadoop.ozone.repair.OzoneRepair
- OZONE_DEBUG_OPTS="${OZONE_DEBUG_OPTS} ${RATIS_OPTS}
${OZONE_MODULE_ACCESS_ARGS}"
OZONE_RUN_ARTIFACT_NAME="ozone-cli-repair"
;;
ratis)
@@ -261,7 +250,6 @@ function ozonecmd_case
;;
vapor)
OZONE_CLASSNAME=org.apache.hadoop.ozone.freon.Vapor
- OZONE_VAPOR_OPTS="${OZONE_VAPOR_OPTS} ${RATIS_OPTS}
${OZONE_MODULE_ACCESS_ARGS}"
OZONE_RUN_ARTIFACT_NAME="ozone-vapor"
;;
iceberg)
@@ -354,6 +342,10 @@ else
shift
fi
+# needed for accepting `ozone shell` but still picking up OZONE_SH_OPTS
+if [[ "${OZONE_SUBCMD}" == "shell" ]]; then
+ OZONE_SUBCMD=sh
+fi
if ozone_need_reexec ozone "${OZONE_SUBCMD}"; then
ozone_uservar_su ozone "${OZONE_SUBCMD}" \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
