Allow telemetry devices use jvm.options instead of ES_JAVA_OPTS (#28)

Unblocks elastic/rally#711
elastic · Aug 13, 2019 · f3827cb · f3827cb
1 parent cced48b
commit f3827cb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/cars/v1/vanilla/templates/config/jvm.options b/cars/v1/vanilla/templates/config/jvm.options
@@ -105,9 +105,11 @@
 # time/date parsing will break in an incompatible way for some date patterns and locals
 9-:-Djava.locale.providers=COMPAT
 
-{# JVM settings provided by the user via the command line #}
-{%- if additional_jvm_settings is defined %}
-{%- for jvm_setting in additional_jvm_settings %}
-{{jvm_setting}}
+# temporary workaround for C2 bug with JDK 10 on hardware with AVX-512
+10-:-XX:UseAVX=2
+
+{%- if additional_java_settings is defined %}
+{%- for value in additional_java_settings %}
+{{value}}
 {%- endfor %}
 {%- endif %}