Skip to content

Commit

Permalink
test(smoketest): tinker with resource limits (cryostatio#1636)
Browse files Browse the repository at this point in the history
* test(smoketest): tinker with resource limits

* append, not override, Quarkus JVM flags

* fix(sidecars): do not clobber default JAVA_OPTS_APPEND
  • Loading branch information
andrewazores committed Sep 6, 2023
1 parent 92fdae5 commit 2f98fe0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ podman run \
--label io.cryostat.jmxHost="localhost" \
--label io.cryostat.jmxPort="0" \
--label io.cryostat.jmxUrl="service:jmx:rmi:///jndi/rmi://localhost:0/jmxrmi" \
--cpus 0.1 \
--memory 384M \
--cpus 0.5 \
--memory 256M \
--mount type=bind,source="$(dirname "$0")/archive",destination=/opt/cryostat.d/recordings.d,relabel=shared \
--mount type=bind,source="$(dirname "$0")/certs",destination=/certs,relabel=shared \
--mount type=bind,source="$(dirname "$0")/clientlib",destination=/clientlib,relabel=shared \
Expand Down
14 changes: 7 additions & 7 deletions smoketest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -259,13 +259,13 @@ runJfrDatasource() {
--name jfr-datasource \
--pull "${PULL_IMAGES}" \
--pod cryostat-pod \
--cpus 0.1 \
--memory 512m \
--cpus 0.2 \
--memory 384M \
--label io.cryostat.discovery="true" \
--label io.cryostat.jmxHost="localhost" \
--label io.cryostat.jmxPort="${RJMX_PORT}" \
--restart on-failure \
--env JAVA_OPTS="-Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote.port=${RJMX_PORT} -Dcom.sun.management.jmxremote.rmi.port=${RJMX_PORT} -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \
--env JAVA_OPTS_APPEND="-XX:-ExitOnOutOfMemoryError -Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote.port=${RJMX_PORT} -Dcom.sun.management.jmxremote.rmi.port=${RJMX_PORT} -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \
--rm -d "${DATASOURCE_IMAGE}"
}

Expand All @@ -286,7 +286,7 @@ runGrafana() {
--pull "${PULL_IMAGES}" \
--pod cryostat-pod \
--cpus 0.1 \
--memory 256M \
--memory 120M \
--env GF_INSTALL_PLUGINS=grafana-simple-json-datasource \
--env GF_AUTH_ANONYMOUS_ENABLED=true \
--env JFR_DATASOURCE_URL="http://${host}:${port}" \
Expand All @@ -312,10 +312,10 @@ runReportGenerator() {
--label io.cryostat.discovery="true" \
--label io.cryostat.jmxHost="localhost" \
--label io.cryostat.jmxPort="${RJMX_PORT}" \
--cpus 0.128 \
--memory 256M \
--cpus 0.2 \
--memory 384M \
--restart on-failure \
--env JAVA_OPTS="-Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote.port=${RJMX_PORT} -Dcom.sun.management.jmxremote.rmi.port=${RJMX_PORT} -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \
--env JAVA_OPTS_APPEND="-XX:-ExitOnOutOfMemoryError -Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote.port=${RJMX_PORT} -Dcom.sun.management.jmxremote.rmi.port=${RJMX_PORT} -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \
--env QUARKUS_HTTP_PORT="${port}" \
--rm -d "${REPORTS_IMAGE}"
}
Expand Down

0 comments on commit 2f98fe0

Please sign in to comment.