Fix shutdown with jmx javaagent enabled #899
Merged
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.
Addresses https://jira.atlassian.com/browse/SCALE-141 and #897
This PR adds jmx exporter JVM flags to
CATALINA_OPTS
instead ofJVM_SUPPORT_RECOMMENDED_ARGS
(all products except Bitbucket)When jmx is enabled in Helm chart values, a javaagent is added to
JVM_SUPPORT_RECOMMENDED_ARGS
that is includedJAVA_OPTS
.From catalina.sh:
As a result, when Tomcat is stopped, javaagent starts and since it already listens on jmx exporter port, it fails. This results in non-graceful shutdown.
From catalina.sh:
Checklist
e2e
label)