From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 3 Dec 2020 10:24:32 +0000 (+0100)
Subject: qa: krbd_stable_pages_required.sh: move to stable_writes attribute
X-Git-Tag: v16.1.0~209^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5adfc15b873bc16d698e7398d3ef2c2a46e8a9df;p=ceph.git

qa: krbd_stable_pages_required.sh: move to stable_writes attribute

bdi/stable_pages_required attribute was deprecated in 5.10 and now
always returns 0.  The replacement is queue/stable_writes.  (It is
also writeable, so we can simplify these test cases somewhat in the
future.)

Fixes: https://tracker.ceph.com/issues/48232
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/qa/suites/krbd/wac/sysfs/tasks/stable_pages_required.yaml b/qa/suites/krbd/wac/sysfs/tasks/stable_pages_required.yaml
deleted file mode 100644
index 3d23227a022c..000000000000
--- a/qa/suites/krbd/wac/sysfs/tasks/stable_pages_required.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - rbd/krbd_stable_pages_required.sh
diff --git a/qa/suites/krbd/wac/sysfs/tasks/stable_writes.yaml b/qa/suites/krbd/wac/sysfs/tasks/stable_writes.yaml
new file mode 100644
index 000000000000..cd1ba930f1f7
--- /dev/null
+++ b/qa/suites/krbd/wac/sysfs/tasks/stable_writes.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - rbd/krbd_stable_writes.sh
diff --git a/qa/workunits/rbd/krbd_stable_pages_required.sh b/qa/workunits/rbd/krbd_stable_pages_required.sh
deleted file mode 100755
index 28b545f6dd83..000000000000
--- a/qa/workunits/rbd/krbd_stable_pages_required.sh
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-function assert_dm() {
-    local name=$1
-    local val=$2
-
-    local devno
-    devno=$(sudo dmsetup info -c --noheadings -o Major,Minor $name)
-    grep -q $val /sys/dev/block/$devno/bdi/stable_pages_required
-}
-
-function dmsetup_reload() {
-    local name=$1
-
-    local table
-    table=$(</dev/stdin)
-
-    sudo dmsetup suspend $name
-    echo "$table" | sudo dmsetup reload $name
-    sudo dmsetup resume $name
-}
-
-IMAGE_NAME="stable-pages-required-test"
-
-rbd create --size 1 $IMAGE_NAME
-DEV=$(sudo rbd map $IMAGE_NAME)
-
-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
-
-rbd resize --size 2 $IMAGE_NAME
-[[ $(blockdev --getsize64 $DEV) -eq 2097152 ]]
-grep -q 1 /sys/block/${DEV#/dev/}/bdi/stable_pages_required
-
-cat <<EOF | sudo dmsetup create tbl
-0 1024 linear $LOOP_DEV 0
-EOF
-assert_dm tbl 0
-sudo dmsetup remove tbl
-
-cat <<EOF | sudo dmsetup create tbl
-0 1024 linear $DEV 0
-EOF
-assert_dm tbl 1
-sudo dmsetup remove tbl
-
-cat <<EOF | sudo dmsetup create tbl
-0 1024 linear $LOOP_DEV 0
-1024 2048 error
-EOF
-assert_dm tbl 0
-sudo dmsetup remove tbl
-
-cat <<EOF | sudo dmsetup create tbl
-0 1024 linear $DEV 0
-1024 2048 error
-EOF
-assert_dm tbl 1
-sudo dmsetup remove tbl
-
-cat <<EOF | sudo dmsetup create tbl
-0 1024 linear $LOOP_DEV 0
-1024 2048 linear $DEV 0
-EOF
-assert_dm tbl 1
-sudo dmsetup remove tbl
-
-cat <<EOF | sudo dmsetup create tbl
-0 1024 linear $DEV 0
-1024 2048 linear $LOOP_DEV 0
-EOF
-assert_dm tbl 1
-sudo dmsetup remove tbl
-
-cat <<EOF | sudo dmsetup create tbl
-0 1024 linear $LOOP_DEV 0
-EOF
-assert_dm tbl 0
-cat <<EOF | dmsetup_reload tbl
-0 1024 linear $LOOP_DEV 0
-1024 2048 linear $DEV 0
-EOF
-assert_dm tbl 1
-cat <<EOF | dmsetup_reload tbl
-0 1024 linear $LOOP_DEV 0
-EOF
-assert_dm tbl 0
-sudo dmsetup remove tbl
-
-cat <<EOF | sudo dmsetup create tbl
-0 1024 linear $DEV 0
-EOF
-assert_dm tbl 1
-cat <<EOF | dmsetup_reload tbl
-0 1024 linear $DEV 0
-1024 2048 linear $LOOP_DEV 0
-EOF
-assert_dm tbl 1
-cat <<EOF | dmsetup_reload tbl
-0 1024 linear $DEV 0
-EOF
-assert_dm tbl 1
-sudo dmsetup remove tbl
-
-cat <<EOF | sudo dmsetup create tbl
-0 1024 linear $DEV 0
-EOF
-assert_dm tbl 1
-cat <<EOF | dmsetup_reload tbl
-0 1024 linear $DEV 0
-1024 2048 linear $LOOP_DEV 0
-EOF
-assert_dm tbl 1
-cat <<EOF | dmsetup_reload tbl
-0 1024 error
-1024 2048 linear $LOOP_DEV 0
-EOF
-assert_dm tbl 0
-cat <<EOF | dmsetup_reload tbl
-0 1024 linear $DEV 0
-1024 2048 linear $LOOP_DEV 0
-EOF
-assert_dm tbl 1
-cat <<EOF | dmsetup_reload tbl
-0 1024 linear $DEV 0
-EOF
-assert_dm tbl 1
-sudo dmsetup remove tbl
-
-sudo losetup -d $LOOP_DEV
-rm loopfile
-
-sudo rbd unmap $DEV
-rbd rm $IMAGE_NAME
-
-echo OK
diff --git a/qa/workunits/rbd/krbd_stable_writes.sh b/qa/workunits/rbd/krbd_stable_writes.sh
new file mode 100755
index 000000000000..d00e5fd043d6
--- /dev/null
+++ b/qa/workunits/rbd/krbd_stable_writes.sh
@@ -0,0 +1,141 @@
+#!/usr/bin/env bash
+
+set -ex
+
+function assert_dm() {
+    local name=$1
+    local val=$2
+
+    local devno
+    devno=$(sudo dmsetup info -c --noheadings -o Major,Minor $name)
+    grep -q $val /sys/dev/block/$devno/queue/stable_writes
+}
+
+function dmsetup_reload() {
+    local name=$1
+
+    local table
+    table=$(</dev/stdin)
+
+    sudo dmsetup suspend $name
+    echo "$table" | sudo dmsetup reload $name
+    sudo dmsetup resume $name
+}
+
+IMAGE_NAME="stable-writes-test"
+
+rbd create --size 1 $IMAGE_NAME
+DEV=$(sudo rbd map $IMAGE_NAME)
+
+fallocate -l 1M loopfile
+LOOP_DEV=$(sudo losetup -f --show loopfile)
+
+[[ $(blockdev --getsize64 $DEV) -eq 1048576 ]]
+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/}/queue/stable_writes
+
+cat <<EOF | sudo dmsetup create tbl
+0 1024 linear $LOOP_DEV 0
+EOF
+assert_dm tbl 0
+sudo dmsetup remove tbl
+
+cat <<EOF | sudo dmsetup create tbl
+0 1024 linear $DEV 0
+EOF
+assert_dm tbl 1
+sudo dmsetup remove tbl
+
+cat <<EOF | sudo dmsetup create tbl
+0 1024 linear $LOOP_DEV 0
+1024 2048 error
+EOF
+assert_dm tbl 0
+sudo dmsetup remove tbl
+
+cat <<EOF | sudo dmsetup create tbl
+0 1024 linear $DEV 0
+1024 2048 error
+EOF
+assert_dm tbl 1
+sudo dmsetup remove tbl
+
+cat <<EOF | sudo dmsetup create tbl
+0 1024 linear $LOOP_DEV 0
+1024 2048 linear $DEV 0
+EOF
+assert_dm tbl 1
+sudo dmsetup remove tbl
+
+cat <<EOF | sudo dmsetup create tbl
+0 1024 linear $DEV 0
+1024 2048 linear $LOOP_DEV 0
+EOF
+assert_dm tbl 1
+sudo dmsetup remove tbl
+
+cat <<EOF | sudo dmsetup create tbl
+0 1024 linear $LOOP_DEV 0
+EOF
+assert_dm tbl 0
+cat <<EOF | dmsetup_reload tbl
+0 1024 linear $LOOP_DEV 0
+1024 2048 linear $DEV 0
+EOF
+assert_dm tbl 1
+cat <<EOF | dmsetup_reload tbl
+0 1024 linear $LOOP_DEV 0
+EOF
+assert_dm tbl 0
+sudo dmsetup remove tbl
+
+cat <<EOF | sudo dmsetup create tbl
+0 1024 linear $DEV 0
+EOF
+assert_dm tbl 1
+cat <<EOF | dmsetup_reload tbl
+0 1024 linear $DEV 0
+1024 2048 linear $LOOP_DEV 0
+EOF
+assert_dm tbl 1
+cat <<EOF | dmsetup_reload tbl
+0 1024 linear $DEV 0
+EOF
+assert_dm tbl 1
+sudo dmsetup remove tbl
+
+cat <<EOF | sudo dmsetup create tbl
+0 1024 linear $DEV 0
+EOF
+assert_dm tbl 1
+cat <<EOF | dmsetup_reload tbl
+0 1024 linear $DEV 0
+1024 2048 linear $LOOP_DEV 0
+EOF
+assert_dm tbl 1
+cat <<EOF | dmsetup_reload tbl
+0 1024 error
+1024 2048 linear $LOOP_DEV 0
+EOF
+assert_dm tbl 0
+cat <<EOF | dmsetup_reload tbl
+0 1024 linear $DEV 0
+1024 2048 linear $LOOP_DEV 0
+EOF
+assert_dm tbl 1
+cat <<EOF | dmsetup_reload tbl
+0 1024 linear $DEV 0
+EOF
+assert_dm tbl 1
+sudo dmsetup remove tbl
+
+sudo losetup -d $LOOP_DEV
+rm loopfile
+
+sudo rbd unmap $DEV
+rbd rm $IMAGE_NAME
+
+echo OK