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
2 changes: 1 addition & 1 deletion scripts/infra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ start_postgres() {
echo "Starting PostgreSQL database '${DB_CONTAINER_NAME}'"
local pid=$(${engine} run \
--cpus 2 \
--memory 128m \
--memory 2g \
-d \
--rm \
--name ${DB_CONTAINER_NAME} \
Expand Down
24 changes: 12 additions & 12 deletions scripts/perf-lab/helpers/cgroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ scripts:
then:
- script: sudo
with:
command: mkdir -p /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/tasks
command: sh -c 'mkdir -p /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/tasks'
# - script: sudo
# with:
# command: chown -R ${{env.USER}} /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/
- script: sudo
with:
command: chown -R ${{env.USER}} /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/
command: sh -c 'echo "+cpu" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control'
- script: sudo
with:
command: echo "+cpu" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control
command: sh -c 'echo "+cpuset" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control'
- script: sudo
with:
command: echo "+cpuset" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control
- script: sudo
with:
command: echo "+memory" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control
command: sh -c 'echo "+memory" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control'
- read-state: ${{CGROUP_CPUSET}}
then:
- regex: .+
Expand All @@ -58,18 +58,18 @@ scripts:
then:
- script: sudo
with:
command: echo "-cpu" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control
command: sh -c 'echo "-cpu" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control'
- script: sudo
with:
command: echo "-cpuset" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control
command: sh -c 'echo "-cpuset" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control'
- script: sudo
with:
command: echo "-memory" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control
command: sh -c 'echo "-memory" >> /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/cgroup.subtree_control'
- script: sudo
with:
command: rmdir /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/tasks/
command: sh -c 'rmdir /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/tasks/'
- script: sudo
with:
command: rmdir /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/
command: sh -c 'rmdir /sys/fs/cgroup/${{CGROUP_NAME:perf-cgroup}}/'
else:
- log: "Non-Linux OS doesn't support cgroups"
12 changes: 6 additions & 6 deletions scripts/perf-lab/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ states:
, updateVersion: "${{config.quarkus.version}}"
, dir: "${{QUARKUS3_DIR}}"
, buildCmd: "./mvnw ${{QUARKUS_MAVEN_OPTIONS}} clean package -DskipTests"
, "runCmd" : "${{BASE_JAVA_CMD}} -jar ${{QUARKUS3_DIR}}/target/quarkus-app/quarkus-run.jar"
, "runCmd" : "${{BASE_JAVA_CMD}} -jar $(realpath ${{QUARKUS3_DIR}}/target/quarkus-app/quarkus-run.jar)"
},
"quarkus3-native": {
"name": "quarkus3-native"
Expand All @@ -56,7 +56,7 @@ states:
, updateVersion: "${{config.quarkus.version}}"
, dir: "${{QUARKUS3_DIR}}"
, buildCmd: "./mvnw ${{QUARKUS_MAVEN_OPTIONS}} clean package -DskipTests -Pnative ${{config.quarkus.native_build_options}}"
, "runCmd" : "${{config.CMD_PREFIX}} ${{QUARKUS3_DIR}}/target/quarkus3-runner ${{config.jvm.memory}}"
, "runCmd" : "${{config.CMD_PREFIX}} $(realpath ${{QUARKUS3_DIR}}/target/quarkus3-runner) ${{config.jvm.memory}}"
},
"spring3-jvm" : {
"name": "spring3-jvm"
Expand All @@ -65,7 +65,7 @@ states:
, updateVersion: "${{config.springboot.version}}"
, dir: "${{SPRING3_BOOT_DIR}}"
, buildCmd: "./mvnw clean package -DskipTests"
, "runCmd" : "${{BASE_JAVA_CMD}} -jar ${{SPRING3_BOOT_DIR}}/target/springboot3.jar"
, "runCmd" : "${{BASE_JAVA_CMD}} -jar $(realpath ${{SPRING3_BOOT_DIR}}/target/springboot3.jar)"
},
"spring3-jvm-aot" : {
"name": "spring3-jvm-aot"
Expand All @@ -74,7 +74,7 @@ states:
, updateVersion: "${{config.springboot.version}}"
, dir: "${{SPRING3_BOOT_DIR}}"
, buildCmd: "./mvnw clean compile spring-boot:process-aot package -DskipTests"
, "runCmd" : "${{BASE_JAVA_CMD}} -Dspring.aot.enabled=true -jar ${{SPRING3_BOOT_DIR}}/target/springboot3.jar"
, "runCmd" : "${{BASE_JAVA_CMD}} -Dspring.aot.enabled=true -jar $(realpath ${{SPRING3_BOOT_DIR}}/target/springboot3.jar)"
},
"spring3-native" : {
"name": "spring3-native"
Expand All @@ -83,7 +83,7 @@ states:
, updateVersion: "${{config.springboot.version}}"
, dir: "${{SPRING3_BOOT_DIR}}"
, buildCmd: "./mvnw clean -Pnative -DskipTests native:compile package ${{config.springboot.native_build_options}}"
, "runCmd" : "${{config.CMD_PREFIX}} ${{SPRING3_BOOT_DIR}}/target/springboot3 ${{config.jvm.memory}}"
, "runCmd" : "${{config.CMD_PREFIX}} $(realpath ${{SPRING3_BOOT_DIR}}/target/springboot3) ${{config.jvm.memory}}"
}
}

Expand Down Expand Up @@ -280,7 +280,7 @@ scripts:
- script: sync-drop-fs-cache
- sh: node ${{JS_SCRIPTS_DIR}}/time.js "${{= "${{RUNTIME.runCmd}}".trim().replace(/ +/g, ' ') }}" ${{TARGET_URL}} | awk '{print $1}'
then:
- set-state: START_TIME
- set-state: START_TIME
- script: state-array-push
with:
array: RUN.output.results.${{RUNTIME.name}}.startup.timings
Expand Down
2 changes: 1 addition & 1 deletion scripts/perf-lab/scripts/time.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const spawn = require("child_process").spawn;
const axios = require('axios');

const pingIntervalMs = 5;
const timeoutMs = 300000;
const timeoutMs = 120000;

const args = process.argv.slice(2);

Expand Down