Commit 6d230de4 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/blobfs: Don't allow run_bsdump() to fail from within the trap call 



If this call fails, for whatever reason, $ROCKSDB_CONF won't be
removed.

Change-Id: I6fff996b04415fc760d3593c0f628d2631ce96ba
Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/960


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 75df5fec

test/blobfs/rocksdb/rocksdb.sh

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ $rootdir/scripts/gen_nvme.sh > $ROCKSDB_CONF 
echo "[Global]" >> $ROCKSDB_CONF

echo "TpointGroupMask 0x80" >> $ROCKSDB_CONF



trap 'dump_db_bench_on_err; run_bsdump; rm -f $ROCKSDB_CONF; exit 1' SIGINT SIGTERM EXIT

trap 'dump_db_bench_on_err; run_bsdump || :; rm -f $ROCKSDB_CONF; exit 1' SIGINT SIGTERM EXIT



if [ -z "$SKIP_MKFS" ]; then

	run_test "blobfs_mkfs" $rootdir/test/blobfs/mkfs/mkfs $ROCKSDB_CONF Nvme0n1