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

Update HammerDB and PG versions #18

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update HammerDB and PG versions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4a4072
Include HammerDB v4.5 & v4.6; make v4.6 the default
naisila Jan 25, 2023
43517c8
Change pg version from 14 to 15
naisila Jan 27, 2023
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 azure/hyperscale-pre-created.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ param timeprofile bool = true


// Configuration of the postgres server group
param pgVersion string = '14'
param pgVersion string = '15'

// Configuration of the VM that runs the benchmark (the driver)
// This VM should be pretty big, to make sure it does not become the bottleneck
Expand Down
2 changes: 1 addition & 1 deletion azure/hyperscale.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ param timeprofile bool = true


// Configuration of the postgres server group
param pgVersion string = '14'
param pgVersion string = '15'
param coordinatorVcores int = 8
param coordinatorStorageSizeMB int = 524288 // 512GB
param workers int = 2
Expand Down
4 changes: 2 additions & 2 deletions azure/iaas-postgres.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ param rampup int = 3
param timeprofile bool = true

// Configuration of the postgres server
param pgVersion string = '14'
param pgVersion string = '15'
param pgSize string = 'Standard_D8s_v3'
param pgStorageSizeGB int = 512
param pgConfigOptions string = ''
Expand Down Expand Up @@ -78,7 +78,7 @@ mkfs.xfs /dev/disk/azure/scsi1/lun0
mkdir /datadrive
mount /dev/disk/azure/scsi1/lun0 /datadrive

mv /var/lib/postgresql/14/main/ /datadrive/pgdata
mv /var/lib/postgresql/15/main/ /datadrive/pgdata

cat >> /etc/postgresql/{0}/main/postgresql.conf << '__postgres_conf_EOF__'
{1}
Expand Down
14 changes: 12 additions & 2 deletions download-hammerdb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,17 @@ if [ "$1" = "master" ]; then
exit
fi

if [ "$1" == 4.4 ]
if [ "$1" == 4.6 ]
then
SHA1=f1ce8891e24dba9dfa99c16781673f37d71e94df
OUTPUT=HammerDB-4.6-Linux.tar.gz
URL=https://github.com/TPC-Council/HammerDB/releases/download/v4.6/$OUTPUT
elif [ "$1" == 4.5 ]
then
SHA1=98c924ad4e99d6f55ef89f098ce638455473dba6
OUTPUT=HammerDB-4.5-Linux.tar.gz
URL=https://github.com/TPC-Council/HammerDB/releases/download/v4.5/$OUTPUT
elif [ "$1" == 4.4 ]
then
SHA1=5347e06baad690336afa6d354330cd59d98343cc
OUTPUT=HammerDB-4.4-Linux.tar.gz
Expand All @@ -39,7 +49,7 @@ then
OUTPUT=HammerDB-3.3-Linux.tar.gz
URL=https://github.com/TPC-Council/HammerDB/releases/download/v3.3/$OUTPUT
else
echo 'Expects version parameter. Supported versions: 3.3 4.0 4.3' 1>&2
echo 'Expects version parameter. Supported versions: 3.3 4.0 4.3 4.4 4.5 4.6' 1>&2
exit 1
fi

Expand Down
6 changes: 3 additions & 3 deletions parse-arguments.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ environment variables:
Arguments:
--hammerdb-version What version of HammerDB to use to run the benchmark.
To be able to run use this script to run Citus
benchmarks it is required to use '4.4' here. All
benchmarks it is required to use '4.4'+ here. All
other versions only work for standard Postgres
benchmarks.
(default: 4.4)
(default: 4.6)
--ch Run both HammerDB TPROC-C and CH-benCHmark queries at
the same time.
--ch-queries-only Run only CH-benCHmark queries (so don't run HammerDB
Expand All @@ -46,7 +46,7 @@ IS_CH_AND_TPCC=${IS_CH_AND_TPCC:-false}
IS_TPCC=${IS_TPCC:-true}
IS_CH=${IS_CH:-false}
IS_CITUS=${IS_CITUS:-true}
HAMMERDB_VERSION=${HAMMERDB_VERSION:-4.4}
HAMMERDB_VERSION=${HAMMERDB_VERSION:-4.6}
isodate=$(date +"%Y-%m-%dT%H:%M:%S")
BENCHNAME=${BENCHNAME:-${isodate}}
SHARD_COUNT=${SHARD_COUNT:-48}
Expand Down