Skip to content

Ignore _JAVA_OPTIONS #124843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 15, 2025
Merged

Ignore _JAVA_OPTIONS #124843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e16e4da
Ignore _JAVA_OPTIONS in CLIs
rjernst Mar 14, 2025
2f47671
Update docs/changelog/124843.yaml
rjernst Mar 14, 2025
3bbaeb7
windows too
rjernst Mar 14, 2025
c0e948a
Merge branch 'main' into startup/ignore_java_options
rjernst Mar 14, 2025
d0dbeec
Merge branch 'main' into startup/ignore_java_options
elasticmachine Mar 14, 2025
4381246
Merge branch 'main' into startup/ignore_java_options
elasticmachine Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions distribution/src/bin/elasticsearch-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,17 @@ else
JAVA_TYPE="bundled JDK"
fi

# do not let JAVA_TOOL_OPTIONS slip in (as the JVM does by default)
# do not let JAVA_TOOL_OPTIONS OR _JAVA_OPTIONS slip in (as the JVM does by default)
if [ ! -z "$JAVA_TOOL_OPTIONS" ]; then
echo "warning: ignoring JAVA_TOOL_OPTIONS=$JAVA_TOOL_OPTIONS"
echo -n "warning: ignoring JAVA_TOOL_OPTIONS=$JAVA_TOOL_OPTIONS; "
echo "pass JVM parameters via ES_JAVA_OPTS"
unset JAVA_TOOL_OPTIONS
fi
if [ ! -z "$_JAVA_OPTIONS" ]; then
echo -n "warning: ignoring _JAVA_OPTIONS=$_JAVA_OPTIONS; "
echo "pass JVM parameters via ES_JAVA_OPTS"
unset _JAVA_OPTIONS
fi

# warn that we are not observing the value of JAVA_HOME
if [ ! -z "$JAVA_HOME" ]; then
Expand Down
10 changes: 8 additions & 2 deletions distribution/src/bin/elasticsearch-env.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,17 @@ if defined ES_JAVA_HOME (
set JAVA_TYPE=bundled JDK
)

rem do not let JAVA_TOOL_OPTIONS slip in (as the JVM does by default)
rem do not let JAVA_TOOL_OPTIONS or _JAVA_OPTIONS slip in (as the JVM does by default)
if defined JAVA_TOOL_OPTIONS (
echo warning: ignoring JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS%
(echo|set /p=ignoring JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS%; )
echo pass JVM parameters via ES_JAVA_OPTS
set JAVA_TOOL_OPTIONS=
)
if defined _JAVA_OPTIONS (
(echo|set /p=ignoring _JAVA_OPTIONS=%_JAVA_OPTIONS%; )
echo pass JVM parameters via ES_JAVA_OPTS
set _JAVA_OPTIONS=
)

rem warn that we are not observing the value of $JAVA_HOME
if defined JAVA_HOME (
Expand Down
5 changes: 5 additions & 0 deletions docs/changelog/124843.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 124843
summary: Ignore _JAVA_OPTIONS
area: Infra/CLI
type: enhancement
issues: []