Browse Source

memory improvements

tags/v0.14.3
Jonathan Cobb 4 years ago
parent
commit
c61f27d472
4 changed files with 4 additions and 3 deletions
  1. +1
    -0
      bubble-server/src/main/java/bubble/service/cloud/AnsiblePrepService.java
  2. +1
    -1
      bubble-server/src/main/resources/META-INF/bubble/bubble.properties
  3. +1
    -1
      bubble-server/src/main/resources/ansible/roles/finalizer/files/bubble_role.json
  4. +1
    -1
      bubble-server/src/main/resources/packer/roles/mitmproxy/tasks/main.yml

+ 1
- 0
bubble-server/src/main/java/bubble/service/cloud/AnsiblePrepService.java View File

@@ -77,6 +77,7 @@ public class AnsiblePrepService {
ctx.put("isNode", installType == AnsibleInstallType.node);
ctx.put("isSage", installType == AnsibleInstallType.sage);
ctx.put("nodeSize", computeDriver.getSize(node.getSizeType()));
ctx.put("jvmMaxRamDivisor", installType == AnsibleInstallType.sage ? "1.7" : "4");
if (restoreKey != null) {
ctx.put("restoreKey", restoreKey);
ctx.put("restoreTimeoutSeconds", RESTORE_MONITOR_SCRIPT_TIMEOUT_SECONDS);


+ 1
- 1
bubble-server/src/main/resources/META-INF/bubble/bubble.properties View File

@@ -1 +1 @@
bubble.version=Adventure 0.14.2
bubble.version=Adventure 0.14.3

+ 1
- 1
bubble-server/src/main/resources/ansible/roles/finalizer/files/bubble_role.json View File

@@ -5,7 +5,7 @@
{"name": "server_alias", "value": "[[network.networkDomain]]"},
{"name": "restore_key", "value": "[[restoreKey]]"},
{"name": "install_type", "value": "[[installType]]"},
{"name": "bubble_java_opts", "value": "-XX:MaxRAM=[[expr nodeSize.memoryMB '//' '2.625']]m"},
{"name": "bubble_java_opts", "value": "-XX:MaxRAM=[[expr nodeSize.memoryMB '//' jvmMaxRamDivisor]]m"},
{"name": "cert_name", "value": "bubble-[[network.shortId]]"}
],
"optionalConfigNames": ["restore_key"]

+ 1
- 1
bubble-server/src/main/resources/packer/roles/mitmproxy/tasks/main.yml View File

@@ -40,7 +40,7 @@
get_url:
url: https://github.com/getbubblenow/bubble-dist/raw/master/mitmproxy/mitmproxy.zip
dest: /tmp/mitmproxy.zip
checksum: sha256:1f6fef51e26c6496955979a84d1c0bd797521832fde01a4de79c7cfe25c3da71
checksum: sha256:b8a59410b3f7651682a2bf657d6d9210e6d4593ad814aa792f35bee1d8fd590f

- name: Unzip mitmproxy.zip
unarchive:


Loading…
Cancel
Save