From 6bd7c5b42c756e1d49be582b14bafe5c9c0e2970 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 25 May 2017 11:54:00 -0700 Subject: [PATCH] test/blobfs: use test stub Signed-off-by: Jim Harris Change-Id: Iba5bb17a30b7d7ec39fe64df93860dd8500f2ad1 Reviewed-on: https://review.gerrithub.io/362607 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker --- etc/spdk/rocksdb.conf.in | 1 + test/blobfs/rocksdb/rocksdb.sh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/etc/spdk/rocksdb.conf.in b/etc/spdk/rocksdb.conf.in index 03288f2fa..cdf713299 100644 --- a/etc/spdk/rocksdb.conf.in +++ b/etc/spdk/rocksdb.conf.in @@ -23,6 +23,7 @@ # syslog facility LogFacility "local7" + SharedMemoryID 0 [Rpc] # Defines whether spdk will enable configuration via RPC. diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh index f702c0e34..3be18f033 100755 --- a/test/blobfs/rocksdb/rocksdb.sh +++ b/test/blobfs/rocksdb/rocksdb.sh @@ -29,14 +29,16 @@ timing_exit db_bench_build cp $rootdir/etc/spdk/rocksdb.conf.in $ROCKSDB_CONF $rootdir/scripts/gen_nvme.sh >> $ROCKSDB_CONF +start_stub "-i 0 -m 0xFFF" +trap 'kill_stub; rm -f $ROCKSDB_CONF; exit 1' SIGINT SIGTERM EXIT + $rootdir/test/lib/blobfs/mkfs/mkfs $ROCKSDB_CONF Nvme0n1 mkdir $output_dir/rocksdb RESULTS_DIR=$output_dir/rocksdb USE_PERF=0 DURATION=30 NUM_KEYS=50000000 ROCKSDB_CONF=$ROCKSDB_CONF $testdir/run_tests.sh $DB_BENCH -trap 'rm -f $ROCKSDB_CONF; exit 1' SIGINT SIGTERM EXIT - trap - SIGINT SIGTERM EXIT +kill_stub rm -f $ROCKSDB_CONF timing_exit rocksdb