Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 ansible/roles/archiver-appliance/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ archiver_appliance_storage: "{{ tomcat_home }}/storage"
archiver_appliance_java_maxmetaspace: "256M"
archiver_appliance_java_initial_heapsize: "512M"
archiver_appliance_java_max_heapsize: "512M"
archiver_appliance_java_heap_tuning_opts: "-XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:-ShrinkHeapInSteps"

# --- The user whose Firefox profile we are modifying ---
firefox_user: "{{ dev_user }}"
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/archiver-appliance/templates/setenv.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# only be used by Tomcat itself, not by the stop process,
# the version command etc.
# Examples are heap size, GC logging, JMX ports etc.
CATALINA_OPTS="-XX:MaxMetaspaceSize={{ archiver_appliance_java_maxmetaspace }} -XX:+UseG1GC -Xms{{ archiver_appliance_java_initial_heapsize }} -Xmx{{ archiver_appliance_java_max_heapsize }} -ea"
CATALINA_OPTS="-XX:MaxMetaspaceSize={{ archiver_appliance_java_maxmetaspace }} -XX:+UseG1GC -Xms{{ archiver_appliance_java_initial_heapsize }} -Xmx{{ archiver_appliance_java_max_heapsize }} {{ archiver_appliance_java_heap_tuning_opts }} -ea"

# CATALINA_TMPDIR (Optional) Directory path location of temporary directory
# the JVM should use (java.io.tmpdir). Defaults to
Expand Down
5 changes: 5 additions & 0 deletions ansible/roles/phoebus/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ phoebus_launcher: "/opt/epics-tools/lib/phoebus/phoebus-product/phoebus.sh"
phoebus_owner: "root"
force_gpu: false

# JAVA options
phoebus_java_initial_heapsize: "256M"
phoebus_java_max_heapsize: "1024M"
phoebus_java_heap_tuning_opts: "-XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:-ShrinkHeapInSteps"

mvn_version: 3.9.14
mvn_home: "/opt/epics-tools/lib/apache-maven"

Expand Down
2 changes: 2 additions & 0 deletions ansible/roles/phoebus/templates/run-phoebus.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ JDK_JAVA_OPTIONS=" -DCA_DISABLE_REPEATER=true"
JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS -Dnashorn.args=--no-deprecation-warning"
JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS -Djdk.gtk.verbose=false -Djdk.gtk.version=2 -Dprism.forceGPU={{ force_gpu }}"
JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS -Dorg.csstudio.javafx.rtplot.update_counter=false"
JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS -Xms{{ phoebus_java_initial_heapsize }} -Xmx{{ phoebus_java_max_heapsize }}"
JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS {{ phoebus_java_heap_tuning_opts }}"
export JDK_JAVA_OPTIONS

echo $JDK_JAVA_OPTIONS
Expand Down
Loading