From 16fb6ba93b22fb3cb60b2a416d401db3b603a080 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 27 Jun 2017 10:02:55 -0700 Subject: [PATCH] Revert "test/blobfs: use test stub" Temporarily disable stub usage in the RocksDB test until we diagnose the cause of the intermittent test failures (no hugepages available). This reverts commit 6bd7c5b42c756e1d49be582b14bafe5c9c0e2970. Change-Id: Ie0eca36c3a15708d2483bae32ce2e217036d2b1d Reviewed-on: https://review.gerrithub.io/367263 Reviewed-by: Ben Walker Reviewed-by: Jim Harris Tested-by: Daniel Verkamp --- etc/spdk/rocksdb.conf.in | 1 - test/blobfs/rocksdb/rocksdb.sh | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) 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