From a4c7ef03226f9fb9358f1e7e9c4d12f4ae9e3226 Mon Sep 17 00:00:00 2001 From: Maximilian Soelch Date: Tue, 2 Jan 2024 15:03:35 +0100 Subject: [PATCH 1/5] Adapt config and readme to Athena changes --- roles/artemis/README.md | 4 +--- roles/artemis/templates/application-prod.yml.j2 | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/roles/artemis/README.md b/roles/artemis/README.md index fa4f510..a162358 100644 --- a/roles/artemis/README.md +++ b/roles/artemis/README.md @@ -115,9 +115,7 @@ Athena configuration: athena: url: secret: - modules: - text: # e.g. module_text_cofee or module_text_llm - programming: # e.g. module_programming_themisml or module_programming_llm + restricted-modules: # optional parameter to restrict access to specific modules, e.g. module_text_llm,module_programming_llm ``` --- diff --git a/roles/artemis/templates/application-prod.yml.j2 b/roles/artemis/templates/application-prod.yml.j2 index c8d80af..1a4649b 100644 --- a/roles/artemis/templates/application-prod.yml.j2 +++ b/roles/artemis/templates/application-prod.yml.j2 @@ -203,9 +203,7 @@ artemis: athena: url: {{ athena.url }} secret: {{ athena.secret }} - modules: - text: {{ athena.modules.text }} - programming: {{ athena.modules.programming }} + restricted-modules: {{ athena.restricted-modules }} {% endif %} {% if apollon_url is defined %} From d77cae4d7513367028e7bb93c84702919cc06f57 Mon Sep 17 00:00:00 2001 From: Timor Morrien Date: Mon, 15 Jan 2024 14:20:54 +0100 Subject: [PATCH 2/5] Add HeapDumpOnOutOfMemoryError --- roles/artemis/templates/artemis.service.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/artemis/templates/artemis.service.j2 b/roles/artemis/templates/artemis.service.j2 index 08b8731..b2fe1ee 100644 --- a/roles/artemis/templates/artemis.service.j2 +++ b/roles/artemis/templates/artemis.service.j2 @@ -15,6 +15,7 @@ ExecStart=/usr/bin/java \ -Djava.security.egd=file:/dev/./urandom \ -Xmx{{ (artemis_system_ram_proportion * ansible_memory_mb.real.total) | int }}m \ -XX:+ShowCodeDetailsInExceptionMessages \ + -XX:+HeapDumpOnOutOfMemoryError \ --add-modules java.se \ --add-exports java.base/jdk.internal.ref=ALL-UNNAMED \ --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED \ From fb071654d2d19754fec8a876180e59689f9edf9e Mon Sep 17 00:00:00 2001 From: Matthias Linhuber Date: Fri, 19 Jan 2024 18:41:46 +0100 Subject: [PATCH 3/5] Version Bump --- galaxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy.yml b/galaxy.yml index 97f545b..523a0e0 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,7 +1,7 @@ namespace: ls1intum name: artemis -version: 0.12.0 +version: 0.13.0 readme: README.md From f65983a95cb732c942aaa74732473e93c651284f Mon Sep 17 00:00:00 2001 From: Timor Morrien Date: Fri, 26 Jan 2024 16:12:28 +0100 Subject: [PATCH 4/5] Add hazelcast.slow.operation.detector.stacktrace.logging.enabled=true --- roles/artemis/templates/artemis.service.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/artemis/templates/artemis.service.j2 b/roles/artemis/templates/artemis.service.j2 index b2fe1ee..5290d68 100644 --- a/roles/artemis/templates/artemis.service.j2 +++ b/roles/artemis/templates/artemis.service.j2 @@ -13,6 +13,7 @@ ExecStart=/usr/bin/java \ -Dfile.encoding=UTF-8 \ -Dsun.jnu.encoding=UTF-8 \ -Djava.security.egd=file:/dev/./urandom \ + -Dhazelcast.slow.operation.detector.stacktrace.logging.enabled=true \ -Xmx{{ (artemis_system_ram_proportion * ansible_memory_mb.real.total) | int }}m \ -XX:+ShowCodeDetailsInExceptionMessages \ -XX:+HeapDumpOnOutOfMemoryError \ From d444a75cf6d92b053870d60b4c9a30806e8c7eb9 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Sat, 27 Jan 2024 20:06:55 +0100 Subject: [PATCH 5/5] add new values for localci --- roles/artemis/templates/application-prod.yml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/artemis/templates/application-prod.yml.j2 b/roles/artemis/templates/application-prod.yml.j2 index 1a4649b..6fb89b2 100644 --- a/roles/artemis/templates/application-prod.yml.j2 +++ b/roles/artemis/templates/application-prod.yml.j2 @@ -181,6 +181,8 @@ artemis: {% if continuous_integration.localci is defined %} continuous-integration: artemis-authentication-token-value: "demo" + specify-concurrent-builds: true + concurrent-build-size: 4 {% endif %}