From 5ac01ab53e49040c9823734130fbac755b52632c Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Mon, 12 Mar 2018 10:10:41 -0700 Subject: [PATCH] test: set all coremasks to use 8 or fewer cores. This will allow us to reduce core assignments for build pool vms to 8. Change-Id: Iba5f6beb387742df2c30b48e22be1961e82af0cf Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/403559 Reviewed-by: John Kariuki Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris Reviewed-on: https://review.gerrithub.io/408413 Tested-by: Daniel Verkamp --- test/blobfs/rocksdb/rocksdb.sh | 2 +- test/blobfs/rocksdb/run_tests.sh | 4 ++-- test/iscsi_tgt/common.sh | 2 +- test/nvmf/common.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh index 0acdc9f21..3e7f7c467 100755 --- a/test/blobfs/rocksdb/rocksdb.sh +++ b/test/blobfs/rocksdb/rocksdb.sh @@ -13,7 +13,7 @@ run_step() { echo "--spdk_cache_size=$CACHE_SIZE" >> "$1"_flags.txt echo -n Start $1 test phase... - /usr/bin/time taskset 0xFFF $DB_BENCH --flagfile="$1"_flags.txt &> "$1"_db_bench.txt + /usr/bin/time taskset 0xFF $DB_BENCH --flagfile="$1"_flags.txt &> "$1"_db_bench.txt echo done. } diff --git a/test/blobfs/rocksdb/run_tests.sh b/test/blobfs/rocksdb/run_tests.sh index a110e934f..d65d3b101 100755 --- a/test/blobfs/rocksdb/run_tests.sh +++ b/test/blobfs/rocksdb/run_tests.sh @@ -140,9 +140,9 @@ run_step() { echo -n Start $1 test phase... if [ "$USE_PERF" = "1" ] then - sudo /usr/bin/time taskset 0xFFF perf record $DB_BENCH --flagfile="$1"_flags.txt &> "$1"_db_bench.txt + sudo /usr/bin/time taskset 0xFF perf record $DB_BENCH --flagfile="$1"_flags.txt &> "$1"_db_bench.txt else - sudo /usr/bin/time taskset 0xFFF $DB_BENCH --flagfile="$1"_flags.txt &> "$1"_db_bench.txt + sudo /usr/bin/time taskset 0xFF $DB_BENCH --flagfile="$1"_flags.txt &> "$1"_db_bench.txt fi echo done. diff --git a/test/iscsi_tgt/common.sh b/test/iscsi_tgt/common.sh index 37c42e3ee..67e5ca1a4 100644 --- a/test/iscsi_tgt/common.sh +++ b/test/iscsi_tgt/common.sh @@ -13,5 +13,5 @@ if [ -z "$ISCSI_APP" ]; then fi if [ -z "$ISCSI_TEST_CORE_MASK" ]; then - ISCSI_TEST_CORE_MASK=0xFFFF + ISCSI_TEST_CORE_MASK=0xFF fi diff --git a/test/nvmf/common.sh b/test/nvmf/common.sh index ff087fc61..40a15c460 100755 --- a/test/nvmf/common.sh +++ b/test/nvmf/common.sh @@ -9,7 +9,7 @@ if [ -z "$NVMF_APP" ]; then fi if [ -z "$NVMF_TEST_CORE_MASK" ]; then - NVMF_TEST_CORE_MASK=0xFFFF + NVMF_TEST_CORE_MASK=0xFF fi function load_ib_rdma_modules()