Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pool_name related changes in run_sync_test in uzfs_test_sync.sh #42

Merged
merged 16 commits into from
May 4, 2018
Merged

pool_name related changes in run_sync_test in uzfs_test_sync.sh #42

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
91c5a76
- making parallel execution of the test in test_uzfs.sh
Apr 11, 2018
40d7dcf
- fixing multiple free of snap_name in case of error in uzfs_get_io_d…
Apr 16, 2018
fbc4cf5
- disabling zrepl for gtest related tests
Apr 16, 2018
9ec695d
- fix in spa_fini->spa_evict_all related to uzfs_spa_fini
Apr 18, 2018
f4bbaa8
Merge remote-tracking branch 'upstream/zfs-0.7-release' into cstor139
Apr 19, 2018
1fb4835
- removing static path for FIO_SRC in test_uzfs.sh
Apr 19, 2018
2731b6f
- addressing review comments
Apr 24, 2018
de2a46d
- changes in lib/fio/replica.c according to fio source code
Apr 24, 2018
1a953e2
Merge remote-tracking branch 'upstream/zfs-0.7-release' into cstor168
Apr 25, 2018
a55266c
- change in pool_name for uzfs_test_sync.sh
Apr 25, 2018
ed669da
- resolving reivew comments
Apr 26, 2018
bc3bf70
- reshuffling test cases in run_uzfs_test function to limit memory co…
Apr 26, 2018
95faa1b
Merge remote-tracking branch 'upstream/zfs-0.7-release' into cstor168
Apr 26, 2018
d9e38b2
- avoiding ztest to run in parallel with run_uzfs_test
May 3, 2018
ce80d4f
Merge branch 'zfs-0.7-release' into cstor168
vishnuitta May 4, 2018
5fdd296
- fixing importargs in uzfs_test_import_pool in uzfs_test.c
May 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ install:
- cd ../zfs
- sh autogen.sh
- if [ $ZFS_BUILD_TAGS = 0 ]; then
./configure --enable-code-coverage=yes --enable-debug --enable-uzfs=yes --with-jemalloc --with-fio=$PWD/../fio || travis_terminate 1;
./configure --with-config=user --enable-code-coverage=yes --enable-debug --enable-uzfs=yes --with-jemalloc --with-fio=$PWD/../fio || travis_terminate 1;
make -j4;
else
./configure --enable-code-coverage=yes --enable-debug || travis_terminate 1;
Expand Down
36 changes: 18 additions & 18 deletions cmd/uzfs_test/uzfs_test_sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,63 +24,63 @@ run_sync_test()

#sync:standard log:yes
echo "running sync test with sync:standard, bs:4k and log device"
log_must setup_uzfs_test log 4096 $UZFS_TEST_VOLSIZE standard uzfs_sync_pool1 \
uzfs_sync_vol1 uzfs_test_sync_vdev1 uzfs_test_sync_log1
log_must export_pool uzfs_sync_pool1
log_must setup_uzfs_test log 4096 $UZFS_TEST_VOLSIZE standard uzfs_sync_pool2 \
uzfs_sync_vol2 uzfs_test_sync_vdev2 uzfs_test_sync_log2
log_must export_pool uzfs_sync_pool2
for i in {1..10}
do
sudo $UZFS_TEST -S -l -p uzfs_sync_pool1 -d uzfs_sync_vol1 -T 1 -w | grep uzfs_sync_data > $TMPDIR/uzfs_sync_data
sudo $UZFS_TEST -S -l -p uzfs_sync_pool2 -d uzfs_sync_vol2 -T 1 -w | grep uzfs_sync_data > $TMPDIR/uzfs_sync_data
if [ $? != 0 ]; then
return 1;
fi

sudo $UZFS_TEST -T 1 -p uzfs_sync_pool1 -d uzfs_sync_vol1 \
sudo $UZFS_TEST -T 1 -p uzfs_sync_pool2 -d uzfs_sync_vol2 \
-V `awk '{print $2}' $TMPDIR/uzfs_sync_data` -m `awk '{print $3}' $TMPDIR/uzfs_sync_data`
if [ $? != 0 ]; then
return 1;
fi
done
cleanup_uzfs_test uzfs_sync_pool1 uzfs_test_sync_vdev1 uzfs_test_sync_log1
cleanup_uzfs_test uzfs_sync_pool2 uzfs_test_sync_vdev2 uzfs_test_sync_log2

#sync:standard log:false
echo "running sync test with sync:standard, bs:64k and no log device"
log_must setup_uzfs_test nolog 65536 $UZFS_TEST_VOLSIZE standard uzfs_sync_pool1 \
uzfs_sync_vol1 uzfs_test_sync_vdev1
log_must export_pool uzfs_sync_pool1
log_must setup_uzfs_test nolog 65536 $UZFS_TEST_VOLSIZE standard uzfs_sync_pool3 \
uzfs_sync_vol3 uzfs_test_sync_vdev3
log_must export_pool uzfs_sync_pool3
for i in {1..10}
do
sudo $UZFS_TEST -S -i 8192 -p uzfs_sync_pool1 -d uzfs_sync_vol1 -b 65536 -T 1 -w | grep uzfs_sync_data > $TMPDIR/uzfs_sync_data
sudo $UZFS_TEST -S -i 8192 -p uzfs_sync_pool3 -d uzfs_sync_vol3 -b 65536 -T 1 -w | grep uzfs_sync_data > $TMPDIR/uzfs_sync_data
if [ $? != 0 ]; then
return 1;
fi

sudo $UZFS_TEST -i 8192 -b 65536 -T 1 -p uzfs_sync_pool1 -d uzfs_sync_vol1 \
sudo $UZFS_TEST -i 8192 -b 65536 -T 1 -p uzfs_sync_pool3 -d uzfs_sync_vol3 \
-V `awk '{print $2}' $TMPDIR/uzfs_sync_data` -m `awk '{print $3}' $TMPDIR/uzfs_sync_data`
if [ $? != 0 ]; then
return 1;
fi
done
cleanup_uzfs_test uzfs_sync_pool1 uzfs_test_sync_vdev1
cleanup_uzfs_test uzfs_sync_pool3 uzfs_test_sync_vdev3

#sync:standard log:true
echo "running sync test with sync:standard, bs=64k and log device"
log_must setup_uzfs_test log 65536 $UZFS_TEST_VOLSIZE standard uzfs_sync_pool1 \
uzfs_sync_vol1 uzfs_test_sync_vdev1 uzfs_test_sync_log1
log_must export_pool uzfs_sync_pool1
log_must setup_uzfs_test log 65536 $UZFS_TEST_VOLSIZE standard uzfs_sync_pool4 \
uzfs_sync_vol4 uzfs_test_sync_vdev4 uzfs_test_sync_log4
log_must export_pool uzfs_sync_pool4
for i in {1..10}
do
sudo $UZFS_TEST -S -i 8192 -b 65536 -p uzfs_sync_pool1 -d uzfs_sync_vol1 -l -T 1 -w | grep uzfs_sync_data > $TMPDIR/uzfs_sync_data
sudo $UZFS_TEST -S -i 8192 -b 65536 -p uzfs_sync_pool4 -d uzfs_sync_vol4 -l -T 1 -w | grep uzfs_sync_data > $TMPDIR/uzfs_sync_data
if [ $? != 0 ]; then
return 1;
fi

sudo $UZFS_TEST -i 8192 -b 65536 -T 1 -p uzfs_sync_pool1 -d uzfs_sync_vol1 \
sudo $UZFS_TEST -i 8192 -b 65536 -T 1 -p uzfs_sync_pool4 -d uzfs_sync_vol4 \
-V `awk '{print $2}' $TMPDIR/uzfs_sync_data` -m `awk '{print $3}' $TMPDIR/uzfs_sync_data`
if [ $? != 0 ]; then
return 1;
fi
done
cleanup_uzfs_test uzfs_sync_pool1 uzfs_test_sync_vdev1 uzfs_test_sync_log1
cleanup_uzfs_test uzfs_sync_pool4 uzfs_test_sync_vdev4 uzfs_test_sync_log4

rm $TMPDIR/uzfs_sync_data
return 0
Expand Down
8 changes: 4 additions & 4 deletions tests/cbtest/script/test_uzfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,9 +936,9 @@ run_uzfs_test()
cleanup_uzfs_test uzfs_pool5 uzfs_test_vdev5
cleanup_uzfs_test uzfs_pool6 uzfs_test_vdev6

log_must setup_uzfs_test nolog 4096 $UZFS_TEST_VOLSIZE standard uzfs_pool6 uzfs_vol6 uzfs_test_vdev6
log_must export_pool uzfs_pool6
$UZFS_TEST -t 30 -v $UZFS_TEST_VOLSIZE_IN_NUM -a $UZFS_TEST_VOLSIZE_IN_NUM \
log_must setup_uzfs_test nolog 4096 $UZFS_TEST_VOLSIZE standard uzfs_pool06 uzfs_vol06 uzfs_test_vdev06
log_must export_pool uzfs_pool06
log_must $UZFS_TEST -t 30 -v $UZFS_TEST_VOLSIZE_IN_NUM -a $UZFS_TEST_VOLSIZE_IN_NUM \
-p uzfs_pool6 -d uzfs_vol6 -T 2 &
pid1=$!

Expand All @@ -961,7 +961,7 @@ run_uzfs_test()

log_must_not greater $ios1 $ios2

cleanup_uzfs_test uzfs_pool6 uzfs_test_vdev6
cleanup_uzfs_test uzfs_pool06 uzfs_test_vdev06
cleanup_uzfs_test uzfs_pool7 uzfs_test_vdev7 uzfs_test_log7
cleanup_uzfs_test uzfs_pool8 uzfs_test_vdev8 uzfs_test_log8

Expand Down