From 81dbd67c118e9415a4436ac436972a9c991dfcc6 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Mon, 8 Jul 2019 12:19:49 +1000
Subject: [PATCH] DCD-434: Add injection of heap and additional JVM opts into
 BB environment.

---
 group_vars/aws_node_local.yml                                | 1 +
 roles/product_startup/molecule/bitbucket/playbook.yml        | 5 +++++
 .../product_startup/molecule/bitbucket/tests/test_default.py | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index 699745f..b4ed155 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -77,6 +77,7 @@ atl_jdbc_query_params_for_engine:
 atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}:{{ atl_db_port }}/{{ atl_jdbc_db_name }}{{ atl_jdbc_query_params_for_engine[atl_db_engine]| default('') }}"
 
 atl_jvm_heap: "{{ lookup('env', 'ATL_JVM_HEAP') or '2048m' }}"
+atl_jvm_opts: "{{ lookup('env', 'ATL_JVM_OPTS') or '' }}"
 atl_catalina_opts: "{{ lookup('env', 'ATL_CATALINA_OPTS') or '' }}"
 atl_proxy_name:  "{{ lookup('env', 'ATL_PROXY_NAME') | lower }}"
 atl_proxy_port:  "{{ lookup('env', 'ATL_TOMCAT_PROXYPORT') }}"
diff --git a/roles/product_startup/molecule/bitbucket/playbook.yml b/roles/product_startup/molecule/bitbucket/playbook.yml
index 08520cb..0542b3a 100644
--- a/roles/product_startup/molecule/bitbucket/playbook.yml
+++ b/roles/product_startup/molecule/bitbucket/playbook.yml
@@ -8,11 +8,16 @@
 
     atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}"
     atl_product_home_shared: "{{ atl_product_home }}/shared"
+    atl_jvm_heap: "dummy_heap"
+    atl_jvm_opts: "dummy_opts"
 
     atl_startup_systemd_params:
       - "UMask=0027"
       - "LimitNOFILE=4096"
       - "Environment=BITBUCKET_HOME={{ atl_product_home }}"
+      - "Environment=JVM_MAXIMUM_MEMORY={{ atl_jvm_heap }}"
+      - "Environment=JVM_MINIMUM_MEMORY={{ atl_jvm_heap }}"
+      - "Environment=JVM_SUPPORT_RECOMMENDED_ARGS={{ atl_jvm_opts }}"
 
     atl_startup_exec_options:
       - "-fg"
diff --git a/roles/product_startup/molecule/bitbucket/tests/test_default.py b/roles/product_startup/molecule/bitbucket/tests/test_default.py
index d12ab59..14feb7c 100644
--- a/roles/product_startup/molecule/bitbucket/tests/test_default.py
+++ b/roles/product_startup/molecule/bitbucket/tests/test_default.py
@@ -12,3 +12,6 @@ def test_service_file(host):
     assert f.contains("^UMask=0027$")
     assert f.contains("^LimitNOFILE=4096$")
     assert f.contains("^Environment=BITBUCKET_HOME=/media/atl/bitbucket$")
+    assert f.contains("^Environment=JVM_MINIMUM_MEMORY=dummy_heap$")
+    assert f.contains("^Environment=JVM_MAXIMUM_MEMORY=dummy_heap$")
+    assert f.contains("^Environment=JVM_SUPPORT_RECOMMENDED_ARGS=dummy_opts$")