From a1954fe39707d7a012d11d575514967c8624c6ba Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Wed, 9 Oct 2019 15:25:50 +0200 Subject: [PATCH] script/run-cbt.sh: add support for ceph-osd testing. The patch brings `--classical` switch to the `run-cbt.sh` script. Its purpose is to automate the apple-to-apple comparison between OSD implementations. In both cases memstore is selected and the same benchmarks are used. Signed-off-by: Radoslaw Zarzynski --- src/script/run-cbt.sh | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/script/run-cbt.sh b/src/script/run-cbt.sh index f13dca9f151..9caddcc4c95 100755 --- a/src/script/run-cbt.sh +++ b/src/script/run-cbt.sh @@ -25,7 +25,8 @@ archive_dir=$PWD/cbt-archive build_dir=$PWD source_dir=$(dirname $PWD) use_existing=false -opts=$(getopt --options "a:h" --longoptions "archive-dir:,build-dir:,source-dir:,cbt:,help,use-existing" --name $prog_name -- "$@") +classical=false +opts=$(getopt --options "a:h" --longoptions "archive-dir:,build-dir:,source-dir:,cbt:,help,use-existing,classical" --name $prog_name -- "$@") eval set -- "$opts" while true; do @@ -50,6 +51,10 @@ while true; do use_existing=true shift ;; + --classical) + classical=true + shift + ;; -h|--help) usage $prog_name return 0 @@ -82,11 +87,17 @@ fi source_dir=$(readlink -f $source_dir) if ! $use_existing; then cd $build_dir - MDS=0 MGR=1 OSD=3 MON=1 $source_dir/src/vstart.sh -n -X \ - --without-dashboard --memstore \ - -o "memstore_device_bytes=34359738368" \ - --crimson --nodaemon --redirect-output \ - --osd-args "--memory 4G" + if $classical; then + MDS=0 MGR=1 OSD=3 MON=1 $source_dir/src/vstart.sh -n -X \ + --without-dashboard --memstore \ + -o "memstore_device_bytes=34359738368" + else + MDS=0 MGR=1 OSD=3 MON=1 $source_dir/src/vstart.sh -n -X \ + --without-dashboard --memstore \ + -o "memstore_device_bytes=34359738368" \ + --crimson --nodaemon --redirect-output \ + --osd-args "--memory 4G" + fi cd - fi @@ -106,5 +117,9 @@ done if ! $use_existing; then cd $build_dir - $source_dir/src/stop.sh --crimson + if $classical; then + $source_dir/src/stop.sh + else + $source_dir/src/stop.sh --crimson + fi fi