Merge pull request #38638 from idryomov/wip-krbd-stable-writes-attr

qa: krbd_stable_pages_required.sh: move to stable_writes attribute

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Ilya Dryomov 2020-12-18 10:30:34 +01:00 committed by GitHub
commit fb03fa3766
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions

View File

@ -1,5 +0,0 @@
tasks:
- workunit:
clients:
all:
- rbd/krbd_stable_pages_required.sh

View File

@ -0,0 +1,5 @@
tasks:
- workunit:
clients:
all:
- rbd/krbd_stable_writes.sh

View File

@ -8,7 +8,7 @@ function assert_dm() {
local devno
devno=$(sudo dmsetup info -c --noheadings -o Major,Minor $name)
grep -q $val /sys/dev/block/$devno/bdi/stable_pages_required
grep -q $val /sys/dev/block/$devno/queue/stable_writes
}
function dmsetup_reload() {
@ -22,7 +22,7 @@ function dmsetup_reload() {
sudo dmsetup resume $name
}
IMAGE_NAME="stable-pages-required-test"
IMAGE_NAME="stable-writes-test"
rbd create --size 1 $IMAGE_NAME
DEV=$(sudo rbd map $IMAGE_NAME)
@ -31,11 +31,11 @@ fallocate -l 1M loopfile
LOOP_DEV=$(sudo losetup -f --show loopfile)
[[ $(blockdev --getsize64 $DEV) -eq 1048576 ]]
grep -q 1 /sys/block/${DEV#/dev/}/bdi/stable_pages_required
grep -q 1 /sys/block/${DEV#/dev/}/queue/stable_writes
rbd resize --size 2 $IMAGE_NAME
[[ $(blockdev --getsize64 $DEV) -eq 2097152 ]]
grep -q 1 /sys/block/${DEV#/dev/}/bdi/stable_pages_required
grep -q 1 /sys/block/${DEV#/dev/}/queue/stable_writes
cat <<EOF | sudo dmsetup create tbl
0 1024 linear $LOOP_DEV 0