ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/iscsi: convert data_digests tests to run_test

Browse Source 
We had very granular timing reporting on this test, but we really only
had two test cases running for the whole thing.

Change-Id: I11650e124e24e93b1f217c6b8efd2fb006284515
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476824
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Seth Howell 2019-12-04 17:15:45 -07:00 committed by Tomasz Zawadzki
parent c6767000a4
commit d29169bd77
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/iscsi_tgt/digests/digests.sh
View File

@ -23,38 +23,26 @@ function node_login_fio_logout() {
function iscsi_header_digest_test() { function iscsi_header_digest_test() {
# Enable HeaderDigest to CRC32C # Enable HeaderDigest to CRC32C
timing_enter HeaderDigest_enabled
node_login_fio_logout "HeaderDigest -v CRC32C" node_login_fio_logout "HeaderDigest -v CRC32C"
timing_exit HeaderDigest_enabled
# Let iscsi target to decide its preference on # Let iscsi target to decide its preference on
# HeaderDigest based on its capability. # HeaderDigest based on its capability.
timing_enter preferred
node_login_fio_logout "HeaderDigest -v CRC32C,None" node_login_fio_logout "HeaderDigest -v CRC32C,None"
timing_exit preferred
} }
function iscsi_header_data_digest_test() { function iscsi_header_data_digest_test() {
# Only enable HeaderDigest to CRC32C # Only enable HeaderDigest to CRC32C
timing_enter HeaderDigest_enabled
node_login_fio_logout "HeaderDigest -v CRC32C" "DataDigest -v None" node_login_fio_logout "HeaderDigest -v CRC32C" "DataDigest -v None"
timing_exit HeaderDigest_enabled
# Only enable DataDigest to CRC32C # Only enable DataDigest to CRC32C
timing_enter DataDigest_enabled
node_login_fio_logout "HeaderDigest -v None" "DataDigest -v CRC32C" node_login_fio_logout "HeaderDigest -v None" "DataDigest -v CRC32C"
timing_exit DataDigest_enabled
# Let iscsi target to decide its preference on both # Let iscsi target to decide its preference on both
# HeaderDigest and DataDigest based on its capability. # HeaderDigest and DataDigest based on its capability.
timing_enter both_preferred
node_login_fio_logout "HeaderDigest -v CRC32C,None" "DataDigest -v CRC32C,None" node_login_fio_logout "HeaderDigest -v CRC32C,None" "DataDigest -v CRC32C,None"
timing_exit both_preferred
# Enable HeaderDigest and DataDigest both. # Enable HeaderDigest and DataDigest both.
timing_enter both_enabled
node_login_fio_logout "HeaderDigest -v CRC32C" "DataDigest -v CRC32C" node_login_fio_logout "HeaderDigest -v CRC32C" "DataDigest -v CRC32C"
timing_exit both_enabled
} }
MALLOC_BDEV_SIZE=64 MALLOC_BDEV_SIZE=64
@ -94,9 +82,9 @@ iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT
# Check and avoid setting DataDigest. # Check and avoid setting DataDigest.
DataDigestAbility=$(iscsiadm -m node -p $TARGET_IP:$ISCSI_PORT -o update -n node.conn[0].iscsi.DataDigest -v None 2>&1 || true) DataDigestAbility=$(iscsiadm -m node -p $TARGET_IP:$ISCSI_PORT -o update -n node.conn[0].iscsi.DataDigest -v None 2>&1 || true)
if [ "$DataDigestAbility"x != x ]; then if [ "$DataDigestAbility"x != x ]; then
iscsi_header_digest_test run_test "case" "iscsi_tgt_digest" iscsi_header_digest_test
else else
iscsi_header_data_digest_test run_test "case" "iscsi_tgt_data_digest" iscsi_header_data_digest_test
fi fi
trap - SIGINT SIGTERM EXIT trap - SIGINT SIGTERM EXIT