From 34c1870837a0bbb78c61e8701ce51d51281b297b Mon Sep 17 00:00:00 2001 From: e7d Date: Thu, 28 Mar 2024 18:27:48 +0100 Subject: [PATCH 1/2] fix(): missing warmup default value --- Dockerfile | 2 +- diskmark.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ebcfcbd..d5b1cf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,6 @@ ENV PROFILE "auto" ENV IO "direct" ENV DATA "random" ENV SIZE 1G -ENV WARMUP 0 +ENV WARMUP 1 ENV RUNTIME 5s ENTRYPOINT [ "diskmark" ] diff --git a/diskmark.sh b/diskmark.sh index 1b9e708..a2b925c 100755 --- a/diskmark.sh +++ b/diskmark.sh @@ -280,6 +280,7 @@ case "$DATA" in esac SIZE="${SIZE:-1G}" BYTESIZE=$(toBytes $SIZE) +WARMUP="${WARMUP:-0}" if [ ! -z $LOOPS ]; then LIMIT="Loops: $LOOPS" LIMIT_OPTION="--loops=$LOOPS" @@ -297,6 +298,7 @@ echo -e "$(color $BOLD $WHITE)Configuration:$(color $RESET) - I/O: $IO - Data: $DATA - Size: $SIZE + - Warmup: $WARMUP - $LIMIT The benchmark is $(color $BOLD $WHITE)running$(color $RESET), please wait..." From 58352bd01805bd08e1601bfdb31367bae036bdc1 Mon Sep 17 00:00:00 2001 From: e7d Date: Thu, 28 Mar 2024 18:29:08 +0100 Subject: [PATCH 2/2] fix(): erroneous hdX, sdX and vdX disk detection in somes cases --- diskmark.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diskmark.sh b/diskmark.sh index a2b925c..3f63448 100755 --- a/diskmark.sh +++ b/diskmark.sh @@ -193,7 +193,7 @@ elif [[ "$FILESYSTEMPARTITION" == nvme* ]]; then DRIVE=$(echo $FILESYSTEMPARTITION | rev | cut -c 3- | rev) ISNVME=1 elif [[ "$FILESYSTEMPARTITION" == hd* ]] || [[ "$FILESYSTEMPARTITION" == sd* ]] || [[ "$FILESYSTEMPARTITION" == vd* ]]; then - DRIVE=$(echo $FILESYSTEMPARTITION | rev | cut -c 2- | rev) + DRIVE=$(echo $FILESYSTEMPARTITION | sed 's/[0-9]*$//') elif [[ "$FILESYSTEMPARTITION" == md* ]]; then DRIVE=$FILESYSTEMPARTITION ISMDADM=1