-
Notifications
You must be signed in to change notification settings - Fork 24.9k
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.
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
Remove parsed JVM settings from general settings in Windows service daemon manager #49061
Merged
williamrandolph
merged 1 commit into
elastic:master
from
williamrandolph:windows-daemon-vars
Nov 14, 2019
Merged
Remove parsed JVM settings from general settings in Windows service daemon manager #49061
williamrandolph
merged 1 commit into
elastic:master
from
williamrandolph:windows-daemon-vars
Nov 14, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The Apache Commons Daemon has some helpful features for Java applications, like nice little next boxes for min heap, max heap, and thread stack size. Our elasticsearch-service.bat script parses those values out of the ES_JAVA_OPTS environment variable and provides them to the Apache Commons Daemon invocation command in order to provide sensible defaults. However, we failed to remove those values from the ES_JAVA_OPTS environment variable, which meant they ended up in the "Java Options" text box and would, from there, override whatever the user put in the specific boxes for heap size or thread stack size. This commit modifies the loop that parses ES_JAVA_OPTS to construct a new enviroment variable containing only the values that aren't parsed out for heap size or thread stack size, then uses that new enviroment variable in the commons daemon invocation command.
rjernst
approved these changes
Nov 14, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Windows black magic. LGTM
jasontedor
added
v7.6.0
:Delivery/Packaging
RPM and deb packaging, tar and zip archives, shell and batch scripts
and removed
7x
labels
Nov 14, 2019
Pinging @elastic/es-core-infra (:Core/Infra/Packaging) |
williamrandolph
added a commit
to williamrandolph/elasticsearch
that referenced
this pull request
Nov 15, 2019
The Apache Commons Daemon has some helpful features for Java applications, like nice little next boxes for min heap, max heap, and thread stack size. Our elasticsearch-service.bat script parses those values out of the ES_JAVA_OPTS environment variable and provides them to the Apache Commons Daemon invocation command in order to provide sensible defaults. However, we failed to remove those values from the ES_JAVA_OPTS environment variable, which meant they ended up in the "Java Options" text box and would, from there, override whatever the user put in the specific boxes for heap size or thread stack size. This commit modifies the loop that parses ES_JAVA_OPTS to construct a new enviroment variable containing only the values that aren't parsed out for heap size or thread stack size, then uses that new enviroment variable in the commons daemon invocation command.
williamrandolph
added a commit
that referenced
this pull request
Nov 15, 2019
The Apache Commons Daemon has some helpful features for Java applications, like nice little next boxes for min heap, max heap, and thread stack size. Our elasticsearch-service.bat script parses those values out of the ES_JAVA_OPTS environment variable and provides them to the Apache Commons Daemon invocation command in order to provide sensible defaults. However, we failed to remove those values from the ES_JAVA_OPTS environment variable, which meant they ended up in the "Java Options" text box and would, from there, override whatever the user put in the specific boxes for heap size or thread stack size. This commit modifies the loop that parses ES_JAVA_OPTS to construct a new enviroment variable containing only the values that aren't parsed out for heap size or thread stack size, then uses that new enviroment variable in the commons daemon invocation command.
This was referenced Feb 3, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
:Delivery/Packaging
RPM and deb packaging, tar and zip archives, shell and batch scripts
>enhancement
Team:Delivery
Meta label for Delivery team
v7.6.0
v8.0.0-alpha1
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Apache Commons Daemon has some helpful features for Java applications, like nice little next boxes for min heap, max heap, and thread stack size. Our
elasticsearch-service.bat
script parses those values out of the ES_JAVA_OPTS environment variable and provides them to the Apache Commons Daemon invocation command in order to provide sensible defaults. However, we failed to remove those values from the ES_JAVA_OPTS environment variable, which meant they ended up in the "Java Options" text box and would, from there, override whatever the user put in the specific boxes for heap size or thread stack size.This commit modifies the loop that parses ES_JAVA_OPTS to construct a new environment variable containing only the values that aren't parsed out for heap size or thread stack size, then uses that new environment variable in the commons daemon invocation command.
Fixes #48796