Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
9d490f5
Disabled some benchmarks and scaled
stanbrub Mar 13, 2026
47f066f
Scaled up basic math combo
stanbrub Mar 13, 2026
dea74d7
Merge branch 'deephaven:main' into gc-benchmarking
stanbrub Mar 19, 2026
15cf1f4
Added a Local Parquet Generator as opposed to going through Kafka
stanbrub Mar 20, 2026
8604111
Added local parquet generator and 1st training test
stanbrub Mar 24, 2026
83b1c11
Added more train benchmarks. Improved Local Parquet Generator
stanbrub Mar 25, 2026
c552c01
Revert BasicMathCombo
stanbrub Mar 26, 2026
62aa96a
Revert BasicMathCombo
stanbrub Mar 26, 2026
f78ca22
Reverted scale and disabled for pre-train standard tests used for pre…
stanbrub Mar 26, 2026
e5412e7
Parallelized local parquet. worked around directory link failures
stanbrub Mar 31, 2026
ff4d891
Added 1st pass at benchmark even retrieval with JFR
stanbrub Apr 1, 2026
f35ab4f
Merge branch 'deephaven:main' into gc-benchmarking
stanbrub Apr 7, 2026
25629cc
Added jfr events
stanbrub Apr 7, 2026
254cca0
Merge branch 'deephaven:main' into gc-benchmarking
stanbrub Apr 7, 2026
528c365
Added UGP events
stanbrub Apr 9, 2026
bd5ff02
Rescaled only static trained for 120 secs
stanbrub Apr 10, 2026
75449bb
Updated adhoc for local parquet env variables
stanbrub Apr 10, 2026
ec2d95e
Open up dh data dir so local parquet can work
stanbrub Apr 10, 2026
a402a54
More logging for benchmark runs
stanbrub Apr 10, 2026
4cf8357
Scaling back AggBy because of system lockup
stanbrub Apr 10, 2026
8507794
Restrict the number of parquet threads and memory for the runner
stanbrub Apr 10, 2026
c0b5e7a
Fixed NaturalJoin OOM
stanbrub Apr 11, 2026
8f1a77f
Added separate scalling for static vs inc
stanbrub Apr 22, 2026
2938992
Better separation for running static and inc. Added ugp deltas
stanbrub Apr 23, 2026
9b326e0
turn on JFR metrics
stanbrub Apr 23, 2026
7fe14cc
Turn off Inc runs
stanbrub Apr 23, 2026
5e1d59c
Added ss_log budget metric
stanbrub May 5, 2026
a1316d4
Added runner setting for auto tune cycle factor
stanbrub May 6, 2026
af3d82b
G1 inc release max
stanbrub May 15, 2026
28745a8
ParallelGC inc release max
stanbrub May 16, 2026
ac0c87f
Shenandoah GC inc release max
stanbrub May 16, 2026
9d630d9
ZGC inc release max
stanbrub May 16, 2026
dfa44df
Inc release filter min
stanbrub May 17, 2026
3ab1845
Updated for 100ms cycle at 90% min
stanbrub May 21, 2026
e0e763f
Added state log ugp times
stanbrub May 28, 2026
4fd604a
Pared down to two Filter/Nat tests
stanbrub May 28, 2026
07eacdf
Scaled for 1 sec cycles
stanbrub May 29, 2026
90e7153
Set autotune to 90% target release
stanbrub Jun 1, 2026
f18c994
User JVM 25 for adhoc
stanbrub Jun 2, 2026
8240602
Added update listener cycle times instead of server state log ones
stanbrub Jun 3, 2026
9951735
Set 20% inc release
stanbrub Jun 3, 2026
7c18a2c
Change inc release to 40%
stanbrub Jun 3, 2026
ce992b3
Change inc release to 60%
stanbrub Jun 4, 2026
fcde3fa
Change inc release to 80%
stanbrub Jun 4, 2026
ff2795a
Change inc release to 100%
stanbrub Jun 4, 2026
60839de
Run 50ms against zfc
stanbrub Jun 4, 2026
d18049c
Make release filter table smaller based on inc release factor
stanbrub Jun 4, 2026
c43719a
Change inc release to 40%
stanbrub Jun 4, 2026
45d5314
Change inc release to 20%
stanbrub Jun 4, 2026
36b1e83
Change inc release to 40%
stanbrub Jun 4, 2026
d4e0255
Change inc release to 60%
stanbrub Jun 4, 2026
1b351a5
Change inc release to 80%
stanbrub Jun 4, 2026
4f4124a
Change inc release to 100%
stanbrub Jun 5, 2026
11dbba7
Scale for Java 25
stanbrub Jun 5, 2026
c048170
Roll back changes some unwanted changes
stanbrub Jun 5, 2026
c9af58a
Switch to java 17
stanbrub Jun 8, 2026
5364601
Change to JVM 25
stanbrub Jun 9, 2026
4af7393
Rescaled for 100ms benchmarks
stanbrub Jun 10, 2026
920c89c
Changed autotune to 90% for testing
stanbrub Jun 10, 2026
37dc336
Add 1.10% inc target
stanbrub Jun 11, 2026
c6f4a00
Turn off static for now. Do inc 100p
stanbrub Jun 12, 2026
e29b3bb
Do huge mem options for 1 sec
stanbrub Jun 17, 2026
83f4c78
Doing Just Inc for 80% throughput now
stanbrub Jun 18, 2026
6837afa
Doing JVM 17 with p1.0 inc and static
stanbrub Jun 22, 2026
e093003
Scale updateBy for 1sec cycles
stanbrub Jun 23, 2026
11f7985
Added sleep for slow DH startups
stanbrub Jun 23, 2026
7ed69b6
Yet more waiting for ZGC
stanbrub Jun 23, 2026
f68564d
More p90 100ms j25 huge benchmarks
stanbrub Jun 24, 2026
0f5c61c
1st try at GC report
stanbrub Jun 24, 2026
d580534
Reformatted summary tables
stanbrub Jun 25, 2026
390f019
Fixed static names
stanbrub Jun 25, 2026
8989a84
Fixed png names
stanbrub Jun 25, 2026
dd15089
Fixed inc memory leak. Made train dashboard.
stanbrub Jun 30, 2026
758520f
Copyright updates
stanbrub Jun 30, 2026
3b9293b
Got train dashboard working against GCloud with csvs pulled up into p…
stanbrub Jul 2, 2026
1f092aa
Added all gc rankings tables
stanbrub Jul 2, 2026
c6190b6
Added train dashboard usage
stanbrub Jul 6, 2026
16d1343
Revamped tables images gor gc-report
stanbrub Jul 7, 2026
e7daf30
Fixed a mispelling
stanbrub Jul 7, 2026
146d770
Renamed docker compose file
stanbrub Jul 7, 2026
b42aff5
Added more train dashboard usage
stanbrub Jul 7, 2026
47b579c
Udpated compare query
stanbrub Jul 9, 2026
b8da078
Merge branch 'deephaven:main' into gc-benchmarking
stanbrub Jul 9, 2026
528b741
Added matrix workflow for support
stanbrub Jul 9, 2026
eec1413
Added matrix framework and tests
stanbrub Jul 10, 2026
d82a059
Fixed missing run dir clear
stanbrub Jul 10, 2026
7a06101
Added total matrix combinations to show up in the UI
stanbrub Jul 13, 2026
008cf06
Fixed missing =
stanbrub Jul 13, 2026
3698323
Fixed test row count
stanbrub Jul 13, 2026
660b5bc
Sigh
stanbrub Jul 13, 2026
19b229e
Course grained heap fail static
stanbrub Jul 13, 2026
f5df613
Made expected combos optional
stanbrub Jul 13, 2026
aa62c8f
Skip slack notification step for adhoc
stanbrub Jul 14, 2026
19f54e1
Do heap failure at real scale
stanbrub Jul 14, 2026
ad45358
Next round of course heap fail
stanbrub Jul 15, 2026
bb6571f
Clear run results and logs before the iterations start
stanbrub Jul 15, 2026
59cbd62
Turn of gzip encoding for GCloud since files are already gzipped
stanbrub Jul 15, 2026
4375652
Finer grained heap fail
stanbrub Jul 15, 2026
c14bb51
More finer grained heap tests
stanbrub Jul 20, 2026
a03bcd7
Added RSS and CPU load events. Try with heap fail
stanbrub Jul 21, 2026
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
53 changes: 53 additions & 0 deletions .github/matrix/gc-train-1000-100.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Compare GC configurations across cycle times and profiles
# TSV columns: run_label, docker_image, test_package, test_class_list,
# test_iterations, scale_row_count, distribution, config_options
EXPECTED_COMBOS=32

IMG=ghcr.io/stanbrub/server:jvm25
PKG=io.deephaven.benchmark.tests.train
CLS='*Train'
ITERS=1
ROWSM=1
DIST=random

BASE="-Xms48g -Xmx48g -XX:+UseStringDeduplication -XX:+UseCompactObjectHeaders -DServerStateTracker.reportIntervalMillis=1000"
HUGE="-XX:+AlwaysPreTouch -XX:+UseTransparentHugePages"

G1="-XX:+UseG1GC"
ZGC="-XX:-UseG1GC -XX:+UseZGC"
SHEN="-XX:-UseG1GC -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational"
PARA="-XX:-UseG1GC -XX:+UseParallelGC"

R="$IMG\t$PKG\t$CLS\t$ITERS\t$ROWSM\t$DIST"

# emit <label> <gc> <cycle_ms> <inc_cycle_factor> — outputs regular and _huge variants
run() {
local opts="$2 $BASE -DPeriodicUpdateGraph.targetCycleDurationMillis=$3 -Dtrain.incLoadTarget=$4 -Dtrain.staticInc=$5"
echo -e "$1\t$R\t$opts"
echo -e "${1}_huge\t$R\t$opts $HUGE"
}

# 1000ms cycle
run gc_g1gc_1000_p100_j25 "$G1" 1000 1.00 Static+Inc
run gc_zgc_1000_p100_j25 "$ZGC" 1000 1.00 Static+Inc
run gc_shen_1000_p100_j25 "$SHEN" 1000 1.00 Static+Inc
run gc_para_1000_p100_j25 "$PARA" 1000 1.00 Static+Inc

# 100ms cycle, 100% load target
run gc_g1gc_100_p100_j25 "$G1" 100 1.00 Inc
run gc_zgc_100_p100_j25 "$ZGC" 100 1.00 Inc
run gc_shen_100_p100_j25 "$SHEN" 100 1.00 Inc
run gc_para_100_p100_j25 "$PARA" 100 1.00 Inc

# 100ms cycle, 90% load target
run gc_g1gc_100_p90_j25 "$G1" 100 0.90 Inc
run gc_zgc_100_p90_j25 "$ZGC" 100 0.90 Inc
run gc_shen_100_p90_j25 "$SHEN" 100 0.90 Inc
run gc_para_100_p90_j25 "$PARA" 100 0.90 Inc

# 100ms cycle, 80% load target
run gc_g1gc_100_p80_j25 "$G1" 100 0.80 Inc
run gc_zgc_100_p80_j25 "$ZGC" 100 0.80 Inc
run gc_shen_100_p80_j25 "$SHEN" 100 0.80 Inc
run gc_para_100_p80_j25 "$PARA" 100 0.80 Inc

58 changes: 58 additions & 0 deletions .github/matrix/gc-train-heap-fail.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Sweep heap size to find failure points per GC and test class
# TSV columns: run_label, docker_image, test_package, test_class_list,
# test_iterations, scale_row_count, distribution, config_options

IMG=ghcr.io/stanbrub/server:jvm25
PKG=io.deephaven.benchmark.tests.train
ITERS=1
ROWSM=10
DIST=random
STEP=1
MODE=Static # Static+Inc

BASE="-XX:+AlwaysPreTouch -XX:+UseTransparentHugePages -XX:+UseStringDeduplication -XX:+UseCompactObjectHeaders -DServerStateTracker.reportIntervalMillis=1000"
CYCLE="-DPeriodicUpdateGraph.targetCycleDurationMillis=1000 -Dtrain.incLoadTarget=1.00 -Dtrain.staticInc=${MODE}"

declare -A GCS=(
[g1gc]="-XX:+UseG1GC"
[zgc]="-XX:-UseG1GC -XX:+UseZGC"
[shen]="-XX:-UseG1GC -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational"
[para]="-XX:-UseG1GC -XX:+UseParallelGC"
)

# Per-class, per-GC heap ranges: "class gc min max"
COMBOS=( # Failure Success
"FilterTrain g1gc 21 21" # 20G 21G
"FilterTrain zgc 2 2" # 1G 2G
"FilterTrain shen 14 14" # 13G 14G
"FilterTrain para 4 4" # 3G 4G
"FormulaTrain g1gc 1 1" # 1G
"FormulaTrain zgc 1 1" # 1G
"FormulaTrain shen 4 4" # 3G 4G
"FormulaTrain para 1 1" # 1G
"NaturalJoinTrain g1gc 17 17" # 16G 17G
"NaturalJoinTrain zgc 16 16" # 15G 16G
"NaturalJoinTrain shen 18 18" # 17G 18G
"NaturalJoinTrain para 20 20" # 19G 20G
"AggByTrain g1gc 1 1" # 1G
"AggByTrain zgc 1 1" # 1G
"AggByTrain shen 1 1" # 1G
"AggByTrain para 17 17" # 16G 17G
"OrderedTrain g1gc 3 3" # 2G 3G
"OrderedTrain zgc 3 3" # 2G 3G
"OrderedTrain shen 3 3" # 2G 3G
"OrderedTrain para 3 3" # 2G 3G
"UpdateByTrain g1gc 15 15" # 14G 15G
"UpdateByTrain zgc 16 16" # 15G 16G
"UpdateByTrain shen 17 17" # 16G 17G
"UpdateByTrain para 19 19" # 18G 19G
)

for combo in "${COMBOS[@]}"; do
read -r cls gc min_heap max_heap <<< "$combo"
for h in $(seq ${max_heap} -${STEP} ${min_heap}); do
opts="${GCS[$gc]} -Xms${h}g -Xmx${h}g $BASE $CYCLE"
echo -e "gc_${gc}_${cls}_h${h}_j25\t$IMG\t$PKG\t*${cls}\t$ITERS\t$ROWSM\t$DIST\t$opts"
done
done

2 changes: 2 additions & 0 deletions .github/resources/adhoc-benchmark-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ services:
- ./data:/data
- ./minio:/minio
environment:
- "JAVA_OPTS=-XX:+UseG1GC"
- "START_OPTS=-DAuthHandlers=io.deephaven.auth.AnonymousAuthenticationHandler ${CONFIG_OPTS}"
- "DEEPHAVEN_HOST_OS_DIR=${ENV_DEEPHAVEN_HOST_OS_DIR}"

redpanda:
command:
Expand Down
9 changes: 5 additions & 4 deletions .github/scripts/adhoc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ rm -f ${OUTPUT_NAME}; touch ${OUTPUT_NAME}
# Get the label part of an image/branch name
# ex. edge@sha256:15ab331629805076cdf5ed6666186c6b578298ab493a980779338d153214640e
# ex. user123:1111-my-pull-request
# ex. ghcr.io/stanbrub/server:jvm25
# ex. 0.36.0 or edge
getSetLabel() {
PREFIX="$1"
Expand All @@ -53,11 +54,11 @@ deleteMetal() {
RESP_CODE=$(curl -s -o /dev/null -w "%{http_code}" -X DELETE -H "Authorization: Bearer ${TOKEN}" "https://api.phoenixnap.com/bmc/v1/servers/${DEVICE_ID}")
CURL_EXIT=$?
if (( ${CURL_EXIT} != 0 )); then
echo "Failed deleting server ${DEVICE_NAME} with exit code ${CURL_EXIT}"
echo "::error::Failed deleting server ${DEVICE_NAME} with exit code ${CURL_EXIT}"
exit 1
fi
if (( ${RESP_CODE} != 404 && (${RESP_CODE} < 200 || ${RESP_CODE} >= 300) )); then
echo "Failed deleting server ${DEVICE_NAME} with http code ${RESP_CODE}"
echo "::error::Failed deleting server ${DEVICE_NAME} with http code ${RESP_CODE}"
exit 1
fi
echo "Successfully deleted server ${DEVICE_NAME}"
Expand Down Expand Up @@ -121,7 +122,7 @@ if [[ ${ACTION} == "deploy-metal" ]]; then
IP_ADDRESS=$(jq -r '.publicIpAddresses[0] // empty' <<< "${RESPONSE}")
DEVICE_ID=$(jq -r '.id // empty' <<< "${RESPONSE}")
if [[ -z "$IP_ADDRESS" || -z "$DEVICE_ID" ]]; then
echo "Failed Getting IP Address and Device ID"
echo "::error::Failed Getting IP Address and Device ID"
exit 1
else
echo "Got Address ${IP_ADDRESS} and Device Id ${DEVICE_ID}"
Expand All @@ -144,7 +145,7 @@ if [[ ${ACTION} == "deploy-metal" ]]; then

DURATION=$(($(date +%s) - ${BEGIN_SECS}))
if [[ ${STATUS} -eq 0 ]]; then
echo "Failed to provision device ${ACTOR} after ${DURATION} seconds"
echo "::error::Failed to provision device ${ACTOR} after ${DURATION} seconds"
echo "Last provision attempt status: ${SERVER_STATUS}"
exit 1
fi
Expand Down
8 changes: 8 additions & 0 deletions .github/scripts/build-benchmark-artifact-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,18 @@ fi

title () { echo; echo $1; }

rm -rf ${RUN_DIR}/results ${RUN_DIR}/logs

if [ -f "${RUN_DIR}/standard-tests.jar" ]; then
echo "Benchmark artifact already built. Skipping."
exit 0
fi

title "- Building Remote Benchmark Artifact on ${HOST} -"

title "-- Building and Verifying --"
cd ${GIT_DIR}
sleep 10 # Some JVM command lines start DH slower than others
mvn verify

title "-- Cleanup After Build --"
Expand Down
5 changes: 5 additions & 0 deletions .github/scripts/build-docker-image-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ fi

title () { echo; echo $1; }

if docker image inspect deephaven/server:benchmark-local &>/dev/null 2>&1; then
echo "Docker image already built. Skipping."
exit 0
fi

title "- Setting up Remote Docker Image on ${HOST} -"

title "-- Building Deephaven Docker Image --"
Expand Down
62 changes: 62 additions & 0 deletions .github/scripts/build-matrix.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#!/usr/bin/env bash

set -o errexit
set -o pipefail

# Copyright (c) 2026-2026 Deephaven Data Labs and Patent Pending

# Runs a matrix script and converts its TSV output to a JSON matrix for GitHub Actions.
# The matrix script outputs tab-separated rows with fields:
# run_label, docker_image, test_package, test_class_list,
# test_iterations, scale_row_count, distribution, config_options
# Scale_row_count is in millions and auto-scaled to actual.
# Test_iterations is auto-forced to odd.
#
# Usage: build-matrix.sh <matrix-script>

FILE="$1"

if [[ -z "$FILE" ]]; then
echo "Usage: build-matrix.sh <matrix-script>"
exit 1
fi

if [[ ! -f "$FILE" ]]; then
echo "::error::Matrix script not found: ${FILE}"
exit 1
fi

TSV=$(bash "$FILE")

RESULT=$(echo "$TSV" | jq -Rsc '
["run_label","docker_image","test_package","test_class_list",
"test_iterations","scale_row_count","distribution","config_options"] as $h |
split("\n") | map(select(length > 0)) |
[.[] | split("\t") | [range(length) as $i | {($h[$i]): .[$i]}] | add |
if .scale_row_count then
.scale_row_count = ((.scale_row_count | tonumber) * 1000000 | tostring)
else . end |
if .test_iterations then
.test_iterations = ((.test_iterations | tonumber) as $n |
if ($n % 2) == 0 then ($n + 1) else $n end | tostring)
else . end
]
')

COUNT=$(echo "$RESULT" | jq 'length')
EXPECTED=$(grep -m1 '^EXPECTED_COMBOS=' "$FILE" | cut -d= -f2 || true)

if [[ -n "$EXPECTED" && "$COUNT" -ne "$EXPECTED" ]]; then
echo "::error::Expected ${EXPECTED} combinations but got ${COUNT}. Update EXPECTED_COMBOS in ${FILE}."; exit 1
fi
echo "Matrix combinations: ${COUNT}"

MATRIX_OUT=$(echo "$RESULT" | jq -c .)
if [[ -n "$GITHUB_OUTPUT" ]]; then
echo "matrix=${MATRIX_OUT}" >> "$GITHUB_OUTPUT"
echo "combo_count=${COUNT}" >> "$GITHUB_OUTPUT"
echo "### Matrix: ${COUNT} combinations" >> "$GITHUB_STEP_SUMMARY"
else
echo "matrix=${MATRIX_OUT}"
fi

19 changes: 14 additions & 5 deletions .github/scripts/build-server-distribution-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,32 @@ fi

title () { echo; echo $1; }

DEEPHAVEN_VERSION_FILE=${GIT_DIR}/deephaven-core/build/version
if [ -f "${DEEPHAVEN_VERSION_FILE}" ]; then
echo "Server distribution already built. Skipping."
exit 0
fi

OWNER=$(sed 's/'"${BRANCH_DELIM}"'.*//g' <<< "${DOCKER_IMG}")
BRANCH_NAME=$(sed 's/.*'"${BRANCH_DELIM}"'//g' <<< "${DOCKER_IMG}")
echo "OWNER: ${OWNER}"
echo "BRANCH: ${BRANCH_NAME}"

title "-- Cloning deephaven-core --"
cd ${GIT_DIR}
rm -rf deephaven-core
# Do not use --single-branch here, because it does not allow checkout by commit hash
git clone https://github.com/${OWNER}/deephaven-core.git
if [ ! -d "deephaven-core" ]; then
# Do not use --single-branch here, because it does not allow checkout by commit hash
git clone https://github.com/${OWNER}/deephaven-core.git
fi
cd deephaven-core
git fetch origin
git checkout ${BRANCH_NAME}

title "-- Cloning deephaven-server-docker --"
cd ${GIT_DIR}
rm -rf deephaven-server-docker
git clone -b main --single-branch https://github.com/deephaven/deephaven-server-docker.git
if [ ! -d "deephaven-server-docker" ]; then
git clone -b main --single-branch https://github.com/deephaven/deephaven-server-docker.git
fi

title "-- Assembling Python Deephaven Core Server --"
cd ${GIT_DIR}/deephaven-core
Expand Down
36 changes: 36 additions & 0 deletions .github/scripts/clear-test-server-remote.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env bash

set -o errexit
set -o pipefail

# Copyright (c) 2026-2026 Deephaven Data Labs and Patent Pending

# Clear all build artifacts and data on the remote server to prepare for a fresh setup

GIT_DIR=${HOME}/git
RUN_DIR=${HOME}/run
DEEPHAVEN_DIR=${HOME}/deephaven

title () { echo; echo $1; }

title "- Clearing Remote Server on $(hostname) -"

title "-- Removing Git Repositories --"
sudo rm -rf ${GIT_DIR}

if command -v docker &>/dev/null; then
title "-- Stopping Docker Containers --"
sudo docker ps -q | xargs --no-run-if-empty -n 1 sudo docker kill
title "-- Removing Docker Containers --"
sudo docker ps -a -q | xargs --no-run-if-empty -n 1 sudo docker rm --force
title "-- Removing Docker Images --"
sudo docker images -a -q | xargs --no-run-if-empty -n 1 sudo docker rmi --force
title "-- Pruning Docker Volumes --"
sudo docker system prune --volumes --force
fi

title "-- Removing Run Directory --"
sudo rm -rf ${RUN_DIR}

title "-- Removing Deephaven Directory --"
sudo rm -rf ${DEEPHAVEN_DIR}
15 changes: 6 additions & 9 deletions .github/scripts/manage-deephaven-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,16 @@ if [[ ${CONFIG_OPTS} == "<default>" ]]; then
CONFIG_OPTS="-Xmx24g"
fi
echo "CONFIG_OPTS=${CONFIG_OPTS}" > .env
echo "ENV_DEEPHAVEN_HOST_OS_DIR=${DEEPHAVEN_DIR}" >> .env

IS_BRANCH="false"
if [[ ${DOCKER_IMG} == *"@sha"*":"* ]]; then
IS_BRANCH="false"
if [[ ${DOCKER_IMG} == ghcr.io/* ]]; then
echo "DOCKER_IMG=${DOCKER_IMG}" >> .env
docker compose pull
elif [[ ${DOCKER_IMG} == *":"* ]]; then
IS_BRANCH="true"
fi

if [[ ${IS_BRANCH} == "false" ]]; then
echo "DOCKER_IMG=deephaven/server:benchmark-local" >> .env
else
echo "DOCKER_IMG=ghcr.io/deephaven/server:${DOCKER_IMG}" >> .env
docker compose pull
else
echo "DOCKER_IMG=deephaven/server:benchmark-local" >> .env
fi

if [[ ${DIRECTIVE} == 'start' ]]; then
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/run-benchmarks-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ title "-- Running Benchmarks --"
set +f
cd ${RUN_DIR}
cat ${RUN_TYPE}-scale-benchmark.properties | sed 's|${baseRowCount}|'"${ROW_COUNT}|g" | sed 's|${baseDistrib}|'"${DISTRIB}|g" | sed 's|${userHome}|'"${HOME}|g" > scale-benchmark.properties
JAVA_OPTS=$(echo -Dbenchmark.profile=scale-benchmark.properties -jar deephaven-benchmark-*-standalone.jar -cp standard-tests.jar)
JAVA_OPTS=$(echo -Xmx4g -Dbenchmark.profile=scale-benchmark.properties -jar deephaven-benchmark-*-standalone.jar -cp standard-tests.jar)
set -f

if [ "${TAG_NAME}" = "Any" ]; then
Expand Down
Loading
Loading