Skip to content

Commit 4897e00

Browse files
authored
Allow overriding JVM options in Windows service (#29044)
Today we allow any other method of starting Elastisearch to override jvm.options via ES_JAVA_OPTS. Yet, for some settings in the Windows service, we do not allow this. This commit removes this in favor of being consistent with other packaging choices.
1 parent 55683d8 commit 4897e00

File tree

1 file changed

+0
-24
lines changed

1 file changed

+0
-24
lines changed

distribution/src/bin/elasticsearch-service.bat

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -120,50 +120,26 @@ echo %ES_JAVA_OPTS%
120120
for %%a in ("%ES_JAVA_OPTS:;=","%") do (
121121
set var=%%a
122122
if "!var:~1,4!" == "-Xms" (
123-
if not "!JVM_MS!" == "" (
124-
echo duplicate min heap size settings found
125-
goto:eof
126-
)
127123
set XMS=!var:~5,-1!
128124
call:convertxm !XMS! JVM_MS
129125
)
130126
if "!var:~1,16!" == "-XX:MinHeapSize=" (
131-
if not "!JVM_MS!" == "" (
132-
echo duplicate min heap size settings found
133-
goto:eof
134-
)
135127
set XMS=!var:~17,-1!
136128
call:convertxm !XMS! JVM_MS
137129
)
138130
if "!var:~1,4!" == "-Xmx" (
139-
if not "!JVM_MX!" == "" (
140-
echo duplicate max heap size settings found
141-
goto:eof
142-
)
143131
set XMX=!var:~5,-1!
144132
call:convertxm !XMX! JVM_MX
145133
)
146134
if "!var:~1,16!" == "-XX:MaxHeapSize=" (
147-
if not "!JVM_MX!" == "" (
148-
echo duplicate max heap size settings found
149-
goto:eof
150-
)
151135
set XMX=!var:~17,-1!
152136
call:convertxm !XMX! JVM_MX
153137
)
154138
if "!var:~1,4!" == "-Xss" (
155-
if not "!JVM_SS!" == "" (
156-
echo duplicate thread stack size settings found
157-
exit 1
158-
)
159139
set XSS=!var:~5,-1!
160140
call:convertxk !XSS! JVM_SS
161141
)
162142
if "!var:~1,20!" == "-XX:ThreadStackSize=" (
163-
if not "!JVM_SS!" == "" (
164-
echo duplicate thread stack size settings found
165-
goto:eof
166-
)
167143
set XSS=!var:~21,-1!
168144
call:convertxk !XSS! JVM_SS
169145
)

0 commit comments

Comments
 (0)