Merge pull request #363 from criteo-forks/PR

Only install jamm if setup requested
michaelklishin · Dec 25, 2017 · f5f2232 · f5f2232
2 parents a97d12c + 288ce1b
commit f5f2232
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/spec/config_spec.rb b/spec/config_spec.rb
@@ -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

diff --git a/templates/default/cassandra-env.sh.erb b/templates/default/cassandra-env.sh.erb
@@ -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 ]