From 22a7e5f6bc902991cdff37ec618e2184f11895da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Sitkiewicz?= Date: Thu, 10 Mar 2022 14:54:18 +0100 Subject: [PATCH] DAOSGCP-81 Fix the calculation of the pool size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Łukasz Sitkiewicz --- terraform/examples/io500/config/config.sh | 2 +- terraform/examples/io500/config/config_1c_1s_8d.sh | 2 +- terraform/examples/io500/config/config_2c_2s_16d.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/examples/io500/config/config.sh b/terraform/examples/io500/config/config.sh index 775e618..9793e09 100644 --- a/terraform/examples/io500/config/config.sh +++ b/terraform/examples/io500/config/config.sh @@ -28,7 +28,7 @@ DAOS_CLIENT_INSTANCE_COUNT="1" DAOS_CLIENT_MACHINE_TYPE=c2-standard-16 # c2-standard-16 n2-standard-2 # Storage -DAOS_POOL_SIZE="$(( 375 * ${DAOS_SERVER_DISK_COUNT} * ${DAOS_SERVER_INSTANCE_COUNT} / 1000 ))TB" +DAOS_POOL_SIZE="$(awk -v disk_count=${DAOS_SERVER_DISK_COUNT} -v server_count=${DAOS_SERVER_INSTANCE_COUNT} 'BEGIN {pool_size = 375 * disk_count * server_count / 1000; print pool_size"TB"}')" DAOS_CONT_REPLICATION_FACTOR="rf:0" # IO500 diff --git a/terraform/examples/io500/config/config_1c_1s_8d.sh b/terraform/examples/io500/config/config_1c_1s_8d.sh index b09d7d7..9c8cc38 100644 --- a/terraform/examples/io500/config/config_1c_1s_8d.sh +++ b/terraform/examples/io500/config/config_1c_1s_8d.sh @@ -28,7 +28,7 @@ DAOS_CLIENT_INSTANCE_COUNT="1" DAOS_CLIENT_MACHINE_TYPE=c2-standard-16 # Storage -DAOS_POOL_SIZE="$(( 375 * ${DAOS_SERVER_DISK_COUNT} * ${DAOS_SERVER_INSTANCE_COUNT} / 1000 ))TB" +DAOS_POOL_SIZE="$(awk -v disk_count=${DAOS_SERVER_DISK_COUNT} -v server_count=${DAOS_SERVER_INSTANCE_COUNT} 'BEGIN {pool_size = 375 * disk_count * server_count / 1000; print pool_size"TB"}')" DAOS_CONT_REPLICATION_FACTOR="rf:0" # IO500 diff --git a/terraform/examples/io500/config/config_2c_2s_16d.sh b/terraform/examples/io500/config/config_2c_2s_16d.sh index 1e4614b..3723115 100644 --- a/terraform/examples/io500/config/config_2c_2s_16d.sh +++ b/terraform/examples/io500/config/config_2c_2s_16d.sh @@ -28,7 +28,7 @@ DAOS_CLIENT_INSTANCE_COUNT="2" DAOS_CLIENT_MACHINE_TYPE=c2-standard-16 # Storage -DAOS_POOL_SIZE="$(( 375 * ${DAOS_SERVER_DISK_COUNT} * ${DAOS_SERVER_INSTANCE_COUNT} / 1000 ))TB" +DAOS_POOL_SIZE="$(awk -v disk_count=${DAOS_SERVER_DISK_COUNT} -v server_count=${DAOS_SERVER_INSTANCE_COUNT} 'BEGIN {pool_size = 375 * disk_count * server_count / 1000; print pool_size"TB"}')" DAOS_CONT_REPLICATION_FACTOR="rf:0" # IO500