diff --git a/etc/spdk/rocksdb.conf.in b/etc/spdk/rocksdb.conf.in index cdf713299..03288f2fa 100644 --- a/etc/spdk/rocksdb.conf.in +++ b/etc/spdk/rocksdb.conf.in @@ -23,7 +23,6 @@ # 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 3be18f033..ab4e4e57d 100755 --- a/test/blobfs/rocksdb/rocksdb.sh +++ b/test/blobfs/rocksdb/rocksdb.sh @@ -29,8 +29,7 @@ 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 +trap 'rm -f $ROCKSDB_CONF; exit 1' SIGINT SIGTERM EXIT $rootdir/test/lib/blobfs/mkfs/mkfs $ROCKSDB_CONF Nvme0n1 mkdir $output_dir/rocksdb @@ -38,7 +37,6 @@ RESULTS_DIR=$output_dir/rocksdb USE_PERF=0 DURATION=30 NUM_KEYS=50000000 ROCKSDB trap - SIGINT SIGTERM EXIT -kill_stub rm -f $ROCKSDB_CONF timing_exit rocksdb