This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 1c7bcd1e77f HDDS-13325. Introduce OZONE_SERVER_OPTS for common options
for server processes (#8685)
1c7bcd1e77f is described below
commit 1c7bcd1e77f35b95a812a0e82c0421860eff6e78
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Jun 24 21:57:28 2025 +0200
HDDS-13325. Introduce OZONE_SERVER_OPTS for common options for server
processes (#8685)
---
.../dist/src/main/compose/compatibility/docker-config | 1 +
.../dist/src/main/smoketest/compatibility/dn.robot | 7 +++----
.../compatibility/{recon.robot => lib.resource} | 19 ++++++++++++-------
.../dist/src/main/smoketest/compatibility/om.robot | 13 ++++---------
.../dist/src/main/smoketest/compatibility/recon.robot | 11 +++--------
.../dist/src/main/smoketest/compatibility/scm.robot | 7 +++----
hadoop-ozone/dist/src/shell/ozone/ozone | 1 +
hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh | 12 ++++++++++++
8 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/compatibility/docker-config
b/hadoop-ozone/dist/src/main/compose/compatibility/docker-config
index f7f1c24b8a0..cae129e8e45 100644
--- a/hadoop-ozone/dist/src/main/compose/compatibility/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/compatibility/docker-config
@@ -37,5 +37,6 @@ HADOOP_OPTS="-Dhadoop.opts=test"
HDFS_STORAGECONTAINERMANAGER_OPTS="-Dhdfs.scm.opts=test"
HDFS_OM_OPTS="-Dhdfs.om.opts=test"
HDDS_DN_OPTS="-Dhdds.dn.opts=test"
+OZONE_SERVER_OPTS="-Dserver.opt=test"
no_proxy=om,scm,s3g,recon,kdc,localhost,127.0.0.1
diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot
b/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot
index c0ec12335fb..8fbdedc8e6c 100644
--- a/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot
@@ -15,13 +15,12 @@
*** Settings ***
Documentation Test datanode compatibility
-Library BuiltIn
-Resource ../lib/os.robot
+Resource lib.resource
Test Timeout 5 minutes
*** Test Cases ***
Picks up command line options
Pass Execution If '%{HDDS_DN_OPTS}' == '' Command-line option
required for process check
- ${processes} = List All Processes
+ ${processes} = Wait for server command-line options
Should Contain ${processes} %{HDDS_DN_OPTS}
- Should Contain ${processes} %{HADOOP_OPTS}
+ Check client command-line options
diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot
b/hadoop-ozone/dist/src/main/smoketest/compatibility/lib.resource
similarity index 64%
copy from hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot
copy to hadoop-ozone/dist/src/main/smoketest/compatibility/lib.resource
index 79f7a3518af..4ab16d39c92 100644
--- a/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/lib.resource
@@ -14,17 +14,22 @@
# limitations under the License.
*** Settings ***
-Documentation Test recon compatibility
Library BuiltIn
+Library OperatingSystem
Resource ../lib/os.robot
-Test Timeout 5 minutes
*** Keywords ***
-Check command-line options
+Check server command-line options
${processes} = List All Processes
Should Contain ${processes} %{HADOOP_OPTS}
+ Should Contain ${processes} %{OZONE_SERVER_OPTS}
+ RETURN ${processes}
-*** Test Cases ***
-Picks up command line options
- Pass Execution If '%{HADOOP_OPTS}' == '' Command-line option
required for process check
- Wait Until Keyword Succeeds 3min 2sec Check command-line options
+Wait for server command-line options
+ ${processes} = Wait Until Keyword Succeeds 3min 2sec Check
server command-line options
+ RETURN ${processes}
+
+Check client command-line options
+ Set Environment Variable OZONE_SHELL_SCRIPT_DEBUG true
+ ${output} = Execute ozone sh --help
+ Should Not Contain ${output} %{OZONE_SERVER_OPTS}
diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot
b/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot
index 6b27946e072..56884bed500 100644
--- a/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot
@@ -15,20 +15,15 @@
*** Settings ***
Documentation Test om compatibility
-Library BuiltIn
-Resource ../lib/os.robot
+Resource lib.resource
Test Timeout 5 minutes
-*** Keywords ***
-Check command-line options
- ${processes} = List All Processes
- Should Contain ${processes} %{HDFS_OM_OPTS}
- Should Contain ${processes} %{HADOOP_OPTS}
-
*** Test Cases ***
Picks up command line options
Pass Execution If '%{HDFS_OM_OPTS}' == '' Command-line option
required for process check
- Wait Until Keyword Succeeds 3min 2sec Check command-line options
+ ${processes} = Wait for server command-line options
+ Should Contain ${processes} %{HDFS_OM_OPTS}
+ Check client command-line options
Rejects Atomic Key Rewrite
Execute ozone freon ockg -n1 -t1 -p rewrite
diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot
b/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot
index 79f7a3518af..782b8a53aa8 100644
--- a/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot
@@ -15,16 +15,11 @@
*** Settings ***
Documentation Test recon compatibility
-Library BuiltIn
-Resource ../lib/os.robot
+Resource lib.resource
Test Timeout 5 minutes
-*** Keywords ***
-Check command-line options
- ${processes} = List All Processes
- Should Contain ${processes} %{HADOOP_OPTS}
-
*** Test Cases ***
Picks up command line options
Pass Execution If '%{HADOOP_OPTS}' == '' Command-line option
required for process check
- Wait Until Keyword Succeeds 3min 2sec Check command-line options
+ Wait for server command-line options
+ Check client command-line options
diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot
b/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot
index 27546f66aa9..6499d512e6b 100644
--- a/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot
@@ -15,13 +15,12 @@
*** Settings ***
Documentation Test scm compatibility
-Library BuiltIn
-Resource ../lib/os.robot
+Resource lib.resource
Test Timeout 5 minutes
*** Test Cases ***
Picks up command line options
Pass Execution If '%{HDFS_STORAGECONTAINERMANAGER_OPTS}' == ''
Command-line option required for process check
- ${processes} = List All Processes
+ ${processes} = Wait for server command-line options
Should Contain ${processes} %{HDFS_STORAGECONTAINERMANAGER_OPTS}
- Should Contain ${processes} %{HADOOP_OPTS}
+ Check client command-line options
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone
b/hadoop-ozone/dist/src/shell/ozone/ozone
index f875c205090..f38ba2f1161 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone
@@ -337,6 +337,7 @@ ozone_suppress_shell_log
ozone_assemble_classpath
ozone_add_client_opts
+ozone_add_server_opts
if [[ ${OZONE_WORKER_MODE} = true ]]; then
ozone_worker_mode_execute "${OZONE_HOME}/bin/ozone" "${OZONE_USER_PARAMS[@]}"
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
b/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
index 0e357ddbe15..5eda5777c35 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
@@ -1563,6 +1563,18 @@ function ozone_add_client_opts
fi
}
+## @description Adds the OZONE_SERVER_OPTS variable to OZONE_OPTS if
OZONE_SUBCMD_SUPPORTDAEMONIZATION is true
+## @audience public
+## @stability stable
+## @replaceable yes
+function ozone_add_server_opts
+{
+ if [[ "${OZONE_SUBCMD_SUPPORTDAEMONIZATION}" == "true" ]] && [[ -n
"${OZONE_SERVER_OPTS:-}" ]]; then
+ ozone_debug "Appending OZONE_SERVER_OPTS onto OZONE_OPTS"
+ OZONE_OPTS="${OZONE_OPTS} ${OZONE_SERVER_OPTS}"
+ fi
+}
+
## @description Finish configuring Hadoop specific system properties
## @description prior to executing Java
## @audience private
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
