Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add PG tests for advanced monitoring feature #3

Merged
merged 12 commits into from
May 13, 2024
Merged

Add PG tests for advanced monitoring feature #3

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
76ce64d
Merge branch 'main' into add-sqlserver-monitoring
bpkroth May 9, 2024
b45368c
Enable use of pg_stat_statement extension in local docker-compose and…
bpkroth May 10, 2024
88af8e6
Enable use of pg_stat_statement extension in local docker-compose and…
bpkroth May 10, 2024
1e56148
enable advanced monitoring for pg as well
bpkroth May 10, 2024
3733b18
allow selectively upping services
bpkroth May 10, 2024
43dacf8
down service
bpkroth May 10, 2024
f41255e
fixup
bpkroth May 10, 2024
4a62240
Merge branch 'enable-pg-stat-extension' into add-sqlserver-monitoring
bpkroth May 10, 2024
9231f1c
tweaks
bpkroth May 10, 2024
8488870
quiet
bpkroth May 10, 2024
b605eba
Merge branch 'main' into add-sqlserver-monitoring
bpkroth May 13, 2024
c3a7770
Merge remote-tracking branch 'anjagruenheid/add-sqlserver-monitoring'…
bpkroth May 13, 2024
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
12 changes: 9 additions & 3 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,14 +468,14 @@ jobs:
# In this case, we load the tpcc data.
if [[ ${{matrix.benchmark}} == templated ]]; then
java -jar benchbase.jar -b tpcc -c config/postgres/sample_tpcc_config.xml --create=true --load=true --execute=false --json-histograms results/histograms.json
java -jar benchbase.jar -b ${{matrix.benchmark}} -c config/postgres/sample_${{matrix.benchmark}}_config.xml --create=false --load=false --execute=true --json-histograms results/histograms.json
java -jar benchbase.jar -b ${{matrix.benchmark}} -c config/postgres/sample_${{matrix.benchmark}}_config.xml -im 1000 -mt advanced --create=false --load=false --execute=true --json-histograms results/histograms.json
elif [[ ${{matrix.benchmark}} == tpcc-with-reconnects ]]; then
# See Also: WITH_SERVICE_INTERRUPTIONS=true docker/build-run-benchmark-with-docker.sh
java -jar benchbase.jar -b tpcc -c config/postgres/sample_tpcc_config.xml --create=true --load=true
(sleep 10 && ./scripts/interrupt-docker-db-service.sh postgres) &
java -jar benchbase.jar -b tpcc -c config/postgres/sample_tpcc_config.xml --execute=true --json-histograms results/histograms.json
java -jar benchbase.jar -b tpcc -c config/postgres/sample_tpcc_config.xml -im 1000 --mt advanced --execute=true --json-histograms results/histograms.json
else
java -jar benchbase.jar -b ${{matrix.benchmark}} -c config/postgres/sample_${{matrix.benchmark}}_config.xml --create=true --load=true --execute=true --json-histograms results/histograms.json
java -jar benchbase.jar -b ${{matrix.benchmark}} -c config/postgres/sample_${{matrix.benchmark}}_config.xml -im 1000 --mt advanced --create=true --load=true --execute=true --json-histograms results/histograms.json
bpkroth marked this conversation as resolved.
Show resolved Hide resolved
fi

# FIXME: Reduce the error rate so we don't need these overrides.
Expand All @@ -491,6 +491,12 @@ jobs:
./scripts/check_latest_benchmark_results.sh $results_benchmark
./scripts/check_histogram_results.sh results/histograms.json $ERRORS_THRESHOLD

# Running the monitor should create at least three files in the 'monitor' directory.
if ![ $(find "./results/monitor" -maxdepth 1 -mindepth 1 | wc -l) -gt 2]; then
echo "ERROR: Advanced monitoring unsuccessful, file directory and/or appropriate files not created." >&2
exit 1
fi

- name: Stop custom postgres service
run: |
./docker/postgres-latest/down.sh
Expand Down