plugin/java: handle OpenJDK as well #880
Merged
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
added 2 commits
May 29, 2019 17:29
collectd-java requires: * `libjvm.so()(64bit)` * `libjvm.so(SUNWprivate_1.1)(64bit)` On CentOS/RHEL 6.x/7.x these are provided by OpenJDK. OpenJDK stores the JVM files in a bit of a different location: `amd64` has been removed from the path. Thus, ATM the link does not get created properly on such systems. Fix this problem by adding two `exec` resources which both will try to create the needed libjvm symbolic link. They are both smart and check if that file exists before trying to execute. An assumption is added to the code that both of the files cannot exist at the same time.
bastelfreak
reviewed
May 29, 2019
manifests/plugin/java.pp
Outdated
| ensure => 'link', | ||
| target => "${java_home}/jre/lib/amd64/server/libjvm.so", | ||
| # OpenJDK based Java distribution | ||
| exec { "/usr/bin/ln -s /usr/lib64/libjvm.so ${java_home}/jre/lib/server/libjvm.so": |
There was a problem hiding this comment.
Why did you replace the file resource with an exec one? The file resource can handle symlinks.
There was a problem hiding this comment.
Indeed it can and I thought about it but how would you implement a conditional File resource which would create /usr/lib64/libjvm.so depending on certain conditions i.e. whether ${java_home}/jre/lib/server/libjvm.so exists or ${java_home/jre/lib/amd64/server/libjvm.so? Maybe I am missing something here but the File resource doesn't have an onlyif parameter and the only way AFAICT to do something like this is via an exec resource.
added 6 commits
May 30, 2019 11:02
bastelfreak
added
bug
|
Thanks for the fix! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
collectd-javarequires:libjvm.so()(64bit)libjvm.so(SUNWprivate_1.1)(64bit)On CentOS/RHEL 6.x/7.x these are provided by OpenJDK. OpenJDK stores the
JVM files in a bit of a different location:
amd64has been removedfrom the path. Thus, ATM the link does not get created properly on such
systems.
Fix this problem by adding two
execresources which both will try tocreate the needed libjvm symbolic link. They are both smart and check if
that file exists before trying to execute. An assumption is added to the
code that both of the files cannot exist at the same time.