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.

Sign up for GitHub

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

Jump to bottom

Only install jamm if setup requested #363

Merged
merged 1 commit into from
Dec 25, 2017
Merged

Only install jamm if setup requested #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions spec/config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
node.default['cassandra']['saved_caches_dir'] = '/var/lib/cassandra/saved_caches'
node.default['cassandra']['snitch_conf'] = { 'dc' => 'testdc', 'rack' => 'testrack' }
node.override['cassandra']['setup_priam'] = true
node.override['cassandra']['setup_jamm'] = true
node.override['cassandra']['setup_jna'] = true
node.override['cassandra']['notify_restart'] = true
node.override['cassandra']['jvm']['g1'] = true
Expand Down
2 changes: 1 addition & 1 deletion templates/default/cassandra-env.sh.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ fi
# provides hints to the JIT compiler
JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"

<% if node['cassandra']['jamm']['version'] -%>
<% if node['cassandra']['setup_jamm'] -%>
# add the jamm javaagent
if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
|| [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
Expand Down