Merge branch 'criteo-forks-master'

michaelklishin · Aug 8, 2017 · af4905f · af4905f
2 parents 41433e8 + 4ed5a7d
commit af4905f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -138,6 +138,8 @@
 default['cassandra']['jvm']['agentpath'] = nil
 default['cassandra']['jvm']['misc_java_agents'] = []
 
+default['cassandra']['jvm']['misc_jvm_options'] = []
+
 default['cassandra']['gc_survivor_ratio'] = 8
 default['cassandra']['gc_max_tenuring_threshold'] = 1
 default['cassandra']['gc_cms_initiating_occupancy_fraction'] = 75

diff --git a/templates/default/cassandra-env.sh.erb b/templates/default/cassandra-env.sh.erb
@@ -335,6 +335,12 @@ JVM_OPTS="$JVM_OPTS -javaagent:<%= agent.to_s -%>"
 <% end %>
 <% end %>
 
+<% if node['cassandra']['jvm']['misc_jvm_options'] %>
+<% node['cassandra']['jvm']['misc_jvm_options'].each do |option| %>
+JVM_OPTS="$JVM_OPTS -D<%= option.to_s -%>"
+<% end %>
+<% end %>
+
 JVM_OPTS="$JVM_OPTS $MX4J_ADDRESS"
 JVM_OPTS="$JVM_OPTS $MX4J_PORT"
 JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS"
diff --git a/templates/default/logback.xml.erb b/templates/default/logback.xml.erb
@@ -67,6 +67,7 @@
       <pattern><%= node['cassandra']['logback']['debug']['pattern'] %></pattern>
     </encoder>
   </appender>
+  <% end -%>
 
   <!-- ASYNCLOG assynchronous appender to debug.log (all levels) -->