Skip to content
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

Sync setenv.sh with upstream 8.13.5 (LTS) #357

Merged
merged 3 commits into from Apr 16, 2021

Conversation

oranenj
Copy link
Contributor

@oranenj oranenj commented Apr 15, 2021

This undeprecates $java_opts for backwards compatibility
and repurposes the other parameters to do what a custom $jvm_type
did previously.

It removes "-XX:HeapDumpOnOutOfMemoryError" because that's
not a default setting in the upstream setenv.sh

It also makes setting $jvm_permgen a no-op, since JIRA doesn't support
JDK older than 8 anymore and the option does nothing

@oranenj oranenj added this to the v5.0.0 milestone Apr 15, 2021
@oranenj
Copy link
Contributor Author

oranenj commented Apr 15, 2021

So I decided to remove the heapdump setting because it's not on by default and theoretically could leak some data from memory to disk. I'm not sure why the module enabled it by default previously.

@oranenj
Copy link
Contributor Author

oranenj commented Apr 15, 2021

Though on second thought, I think less disruptive would be to just add a new parameter that's preferred over jira::java_opts if defined, and leave the old default in place... On the other hand, if Atlassian decides to change setenv.sh again, the "main" API needs to change again to stay consistent...

This undeprecates $java_opts for backwards compatibility
and repurposes the other parameters to do what a custom $jvm_type
did previously.

It removes "-XX:HeapDumpOnOutOfMemoryError" because that's
not a default setting in the upstream setenv.sh

It also makes setting $jvm_permgen a no-op, since JIRA doesn't support
JDK older than 8 anymore and the option does nothing
@oranenj
Copy link
Contributor Author

oranenj commented Apr 16, 2021

The merge conflict was with a redundant test

@oranenj oranenj merged commit 6f3ed71 into voxpupuli:master Apr 16, 2021
cegeka-jenkins pushed a commit to cegeka/puppet-jira that referenced this pull request Oct 13, 2021
* Sync setenv.sh settings with upstream and reduce diff

This undeprecates $java_opts for backwards compatibility
and repurposes the other parameters to do what a custom $jvm_type
did previously.

It removes "-XX:HeapDumpOnOutOfMemoryError" because that's
not a default setting in the upstream setenv.sh

It also makes setting $jvm_permgen a no-op, since JIRA doesn't support
JDK older than 8 anymore and the option does nothing

* Add maintainer note about sticking close to upstream
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants