From 326ac51a1c66ff35361fc26f4a4df52f2e93e6fe Mon Sep 17 00:00:00 2001
From: Lukasz Dorau <lukasz.dorau@intel.com>
Date: Thu, 26 Sep 2019 11:46:15 +0200
Subject: [PATCH] test: add $NAMESPACE parameter to expect_bad_blocks
.. so that only bad blocks from the given namespace were checked.
---
src/test/common_badblock.sh | 18 +++++++++++++-----
src/test/pmempool_check/TEST31 | 8 ++++----
src/test/pmempool_check/TEST32 | 8 ++++----
src/test/pmempool_create/TEST10 | 2 +-
src/test/pmempool_create/TEST11 | 2 +-
src/test/pmempool_create/TEST12 | 2 +-
src/test/pmempool_info/TEST24 | 2 +-
src/test/pmempool_info/TEST25 | 2 +-
src/test/pmempool_sync/TEST27 | 6 +++---
src/test/pmempool_sync/TEST28 | 6 +++---
src/test/pmempool_sync/TEST30 | 6 +++---
src/test/pmempool_sync/TEST31 | 6 +++---
src/test/pmempool_sync/TEST38 | 6 +++---
src/test/pmempool_sync/TEST39 | 6 +++---
src/test/pmempool_sync/TEST40 | 6 +++---
src/test/pmempool_sync/TEST41 | 6 +++---
src/test/pmempool_sync_remote/TEST22 | 4 ++--
src/test/pmempool_sync_remote/TEST23 | 4 ++--
src/test/pmempool_sync_remote/TEST24 | 4 ++--
src/test/pmempool_sync_remote/TEST25 | 4 ++--
src/test/pmempool_sync_remote/TEST32 | 4 ++--
src/test/pmempool_sync_remote/TEST33 | 4 ++--
src/test/pmempool_sync_remote/TEST34 | 4 ++--
src/test/pmempool_sync_remote/TEST35 | 4 ++--
src/test/util_badblock/TEST3 | 2 +-
src/test/util_badblock/TEST4 | 2 +-
src/test/util_badblock/TEST6 | 2 +-
src/test/util_badblock/TEST7 | 2 +-
src/test/util_badblock/TEST8 | 2 +-
src/test/util_badblock/TEST9 | 2 +-
30 files changed, 72 insertions(+), 64 deletions(-)
diff --git a/src/test/common_badblock.sh b/src/test/common_badblock.sh
index b008ccd72..7e4c10de2 100644
--- a/src/test/common_badblock.sh
+++ b/src/test/common_badblock.sh
@@ -682,11 +682,14 @@ function print_bad_blocks {
#
# expect_bad_blocks -- verify if there are required bad blocks
-# and fail if they are not there
+# in the given namespace and fail if they are not there
+#
+# Input arguments:
+# 1) namespace
#
function expect_bad_blocks {
# XXX sudo should be removed when it is not needed
- sudo ndctl list -M | grep -e "badblock_count" -e "offset" -e "length" >> $LOG && true
+ sudo ndctl list -M -n $1 | grep -e "badblock_count" -e "offset" -e "length" >> $LOG && true
if [ $? -ne 0 ]; then
# XXX sudo should be removed when it is not needed
sudo ndctl list -M &>> $PREP_LOG_FILE && true
@@ -701,12 +704,17 @@ function expect_bad_blocks {
}
#
-# expect_bad_blocks -- verify if there are required bad blocks
-# and fail if they are not there
+# expect_bad_blocks_node -- verify if there are required bad blocks
+# in the given namespace on the given node
+# and fail if they are not there
+#
+# Input arguments:
+# 1) node number
+# 2) namespace
#
function expect_bad_blocks_node {
# XXX sudo should be removed when it is not needed
- expect_normal_exit run_on_node $1 sudo ndctl list -M | \
+ expect_normal_exit run_on_node $1 sudo ndctl list -M -n $2 | \
grep -e "badblock_count" -e "offset" -e "length" >> $LOG \
|| fatal "Error: ndctl failed to inject or retain bad blocks (node $1)"
}
diff --git a/src/test/pmempool_check/TEST31 b/src/test/pmempool_check/TEST31
index 66be7cb6f..627ac9b57 100755
--- a/src/test/pmempool_check/TEST31
+++ b/src/test/pmempool_check/TEST31
@@ -67,19 +67,19 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 0)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
ndctl_uninject_error $FULLDEV $NAMESPACE $FIRST_SECTOR 1
diff --git a/src/test/pmempool_check/TEST32 b/src/test/pmempool_check/TEST32
index 44f62a0bc..f59039a71 100755
--- a/src/test/pmempool_check/TEST32
+++ b/src/test/pmempool_check/TEST32
@@ -65,19 +65,19 @@ turn_on_checking_bad_blocks $POOLSET
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
ndctl_uninject_error $FULLDEV $NAMESPACE 11 1
diff --git a/src/test/pmempool_create/TEST10 b/src/test/pmempool_create/TEST10
index 74ec7aa05..b9c20c187 100755
--- a/src/test/pmempool_create/TEST10
+++ b/src/test/pmempool_create/TEST10
@@ -61,7 +61,7 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX rm $POOLSET
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
#
# When the compat feature POOL_FEAT_CHECK_BAD_BLOCKS is enabled by default,
diff --git a/src/test/pmempool_create/TEST11 b/src/test/pmempool_create/TEST11
index 80a2a0510..008e0c6ff 100755
--- a/src/test/pmempool_create/TEST11
+++ b/src/test/pmempool_create/TEST11
@@ -67,7 +67,7 @@ create_poolset $POOLSET 10M:$DIR/testfile1:x 10M:$FILE:x 10M:$DIR/testfile2:x
SECTOR=$(expect_normal_exit $EXTENTS $FILE -l 100)
ndctl_inject_error $NAMESPACE $SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
#
# When the compat feature POOL_FEAT_CHECK_BAD_BLOCKS is enabled by default,
diff --git a/src/test/pmempool_create/TEST12 b/src/test/pmempool_create/TEST12
index a5dbdf530..6e47ef047 100755
--- a/src/test/pmempool_create/TEST12
+++ b/src/test/pmempool_create/TEST12
@@ -62,7 +62,7 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX rm $POOLSET
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX create obj -b --layout pmempool$SUFFIX $POOLSET >> $LOG"
diff --git a/src/test/pmempool_info/TEST24 b/src/test/pmempool_info/TEST24
index 528f0f9dc..c4ca60f0a 100755
--- a/src/test/pmempool_info/TEST24
+++ b/src/test/pmempool_info/TEST24
@@ -62,7 +62,7 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX create obj --layout pmempool$SUFFIX $POOL
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit $PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG
diff --git a/src/test/pmempool_info/TEST25 b/src/test/pmempool_info/TEST25
index 99a6537ac..380f0411c 100755
--- a/src/test/pmempool_info/TEST25
+++ b/src/test/pmempool_info/TEST25
@@ -64,7 +64,7 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX create obj --layout pmempool$SUFFIX $POOL
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 0)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit $PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG
diff --git a/src/test/pmempool_sync/TEST27 b/src/test/pmempool_sync/TEST27
index 753cba0cc..10bb77189 100755
--- a/src/test/pmempool_sync/TEST27
+++ b/src/test/pmempool_sync/TEST27
@@ -74,15 +74,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 8)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
diff --git a/src/test/pmempool_sync/TEST28 b/src/test/pmempool_sync/TEST28
index f5799245e..7ac4aa6f6 100755
--- a/src/test/pmempool_sync/TEST28
+++ b/src/test/pmempool_sync/TEST28
@@ -69,15 +69,15 @@ turn_on_checking_bad_blocks $POOLSET
# inject bad block: OFF=0 LEN=1
ndctl_inject_error $NAMESPACE 0 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
diff --git a/src/test/pmempool_sync/TEST30 b/src/test/pmempool_sync/TEST30
index 4c944fddb..ea3398067 100755
--- a/src/test/pmempool_sync/TEST30
+++ b/src/test/pmempool_sync/TEST30
@@ -74,15 +74,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 1000)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
diff --git a/src/test/pmempool_sync/TEST31 b/src/test/pmempool_sync/TEST31
index 6284d500c..df935e650 100755
--- a/src/test/pmempool_sync/TEST31
+++ b/src/test/pmempool_sync/TEST31
@@ -69,15 +69,15 @@ turn_on_checking_bad_blocks $POOLSET
# inject bad block: OFF=1000 LEN=1
ndctl_inject_error $NAMESPACE 1000 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
diff --git a/src/test/pmempool_sync/TEST38 b/src/test/pmempool_sync/TEST38
index 7492292c4..060179895 100755
--- a/src/test/pmempool_sync/TEST38
+++ b/src/test/pmempool_sync/TEST38
@@ -84,15 +84,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile0 -l 8000)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# run sync and break it after clearing bad blocks and before recovering data using gdb
expect_normal_exit gdb --batch \
diff --git a/src/test/pmempool_sync/TEST39 b/src/test/pmempool_sync/TEST39
index 66aa7771c..514e9fac3 100755
--- a/src/test/pmempool_sync/TEST39
+++ b/src/test/pmempool_sync/TEST39
@@ -84,15 +84,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 1000)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# run sync and break it after clearing bad blocks and before recovering data using gdb
expect_normal_exit gdb --batch \
diff --git a/src/test/pmempool_sync/TEST40 b/src/test/pmempool_sync/TEST40
index 8f6e9b7df..a71c319bc 100755
--- a/src/test/pmempool_sync/TEST40
+++ b/src/test/pmempool_sync/TEST40
@@ -84,15 +84,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile0 -l 1000)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# run sync and break it during saving bad block recovery files
expect_normal_exit gdb --batch \
diff --git a/src/test/pmempool_sync/TEST41 b/src/test/pmempool_sync/TEST41
index a434c9d34..96c42468f 100755
--- a/src/test/pmempool_sync/TEST41
+++ b/src/test/pmempool_sync/TEST41
@@ -84,15 +84,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 1000)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# run sync and break it during saving bad block recovery files
expect_normal_exit gdb --batch \
diff --git a/src/test/pmempool_sync_remote/TEST22 b/src/test/pmempool_sync_remote/TEST22
index c464fca88..e5f11f145 100755
--- a/src/test/pmempool_sync_remote/TEST22
+++ b/src/test/pmempool_sync_remote/TEST22
@@ -107,11 +107,11 @@ FILE=${MOUNT_DIR}/pool.local
FIRST_SECTOR=$(expect_normal_exit run_on_node 0 ../extents $FILE -l 0)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST23 b/src/test/pmempool_sync_remote/TEST23
index 69a16111f..01da7f1dd 100755
--- a/src/test/pmempool_sync_remote/TEST23
+++ b/src/test/pmempool_sync_remote/TEST23
@@ -107,11 +107,11 @@ FILE=${MOUNT_DIR}/pool.local
FIRST_SECTOR=$(expect_normal_exit run_on_node 0 ../extents $FILE -l 1000)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST24 b/src/test/pmempool_sync_remote/TEST24
index d6b8df934..c9016de9d 100755
--- a/src/test/pmempool_sync_remote/TEST24
+++ b/src/test/pmempool_sync_remote/TEST24
@@ -112,11 +112,11 @@ FIRST_SECTOR=$(expect_normal_exit run_on_node 0 ../extents $FILE -l 0)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST25 b/src/test/pmempool_sync_remote/TEST25
index 890488c1d..ea672e62c 100755
--- a/src/test/pmempool_sync_remote/TEST25
+++ b/src/test/pmempool_sync_remote/TEST25
@@ -111,11 +111,11 @@ FIRST_SECTOR=$(expect_normal_exit run_on_node 0 ../extents $FILE -l 1000)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST32 b/src/test/pmempool_sync_remote/TEST32
index c93ee2773..01653d7ac 100755
--- a/src/test/pmempool_sync_remote/TEST32
+++ b/src/test/pmempool_sync_remote/TEST32
@@ -121,11 +121,11 @@ FILE_1=${MOUNT_DIR}/pool.local.part.1
FIRST_SECTOR_1=$(expect_normal_exit run_on_node 0 ../extents $FILE_1 -l 0)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR_1 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST33 b/src/test/pmempool_sync_remote/TEST33
index a7d00edd7..1163808f7 100755
--- a/src/test/pmempool_sync_remote/TEST33
+++ b/src/test/pmempool_sync_remote/TEST33
@@ -121,11 +121,11 @@ FILE_1=${MOUNT_DIR}/pool.local.part.1
FIRST_SECTOR_1=$(expect_normal_exit run_on_node 0 ../extents $FILE_1 -l 1000)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR_1 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST34 b/src/test/pmempool_sync_remote/TEST34
index d64e14242..aab87a3dd 100755
--- a/src/test/pmempool_sync_remote/TEST34
+++ b/src/test/pmempool_sync_remote/TEST34
@@ -111,12 +111,12 @@ FIRST_SECTOR=$(expect_normal_exit run_on_node 1 ../extents $FILE -l 0)
ndctl_inject_error_node 1 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 1
+expect_bad_blocks_node 1 $NAMESPACE
# verification should fail
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}/$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 1
+expect_bad_blocks_node 1 $NAMESPACE
# the remote replica contains bad blocks, so it cannot be opened and will be recreated
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}/$POOLSET_LOCAL &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST35 b/src/test/pmempool_sync_remote/TEST35
index 180e0c159..14fe7de1a 100755
--- a/src/test/pmempool_sync_remote/TEST35
+++ b/src/test/pmempool_sync_remote/TEST35
@@ -111,12 +111,12 @@ FIRST_SECTOR=$(expect_normal_exit run_on_node 1 ../extents $FILE -l 1000)
ndctl_inject_error_node 1 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 1
+expect_bad_blocks_node 1 $NAMESPACE
# verification should fail
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}/$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 1
+expect_bad_blocks_node 1 $NAMESPACE
# the remote replica contains bad blocks, so it cannot be opened and will be recreated
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}/$POOLSET_LOCAL &>> $LOG"
diff --git a/src/test/util_badblock/TEST3 b/src/test/util_badblock/TEST3
index fecf34868..237f643de 100755
--- a/src/test/util_badblock/TEST3
+++ b/src/test/util_badblock/TEST3
@@ -54,7 +54,7 @@ badblock_test_init dax_device
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit ./util_badblock$EXESUFFIX $FULLDEV l
diff --git a/src/test/util_badblock/TEST4 b/src/test/util_badblock/TEST4
index 36158374f..811c74e2d 100755
--- a/src/test/util_badblock/TEST4
+++ b/src/test/util_badblock/TEST4
@@ -55,7 +55,7 @@ badblock_test_init dax_device
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit ./util_badblock$EXESUFFIX $FULLDEV l c l
diff --git a/src/test/util_badblock/TEST6 b/src/test/util_badblock/TEST6
index 941571dc3..95f6766fc 100755
--- a/src/test/util_badblock/TEST6
+++ b/src/test/util_badblock/TEST6
@@ -59,7 +59,7 @@ fallocate -l 1M $FILE
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $FILE -l 0)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit ./util_badblock$EXESUFFIX $FILE l
diff --git a/src/test/util_badblock/TEST7 b/src/test/util_badblock/TEST7
index a5dd847b4..b5816e49e 100755
--- a/src/test/util_badblock/TEST7
+++ b/src/test/util_badblock/TEST7
@@ -60,7 +60,7 @@ fallocate -l 1M $FILE
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $FILE -l 0)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
enable_log_append
diff --git a/src/test/util_badblock/TEST8 b/src/test/util_badblock/TEST8
index ae4c2d3b7..1dc5ceaeb 100755
--- a/src/test/util_badblock/TEST8
+++ b/src/test/util_badblock/TEST8
@@ -59,7 +59,7 @@ turn_on_checking_bad_blocks $FULLDEV
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# open a pool with bad blocks
expect_abnormal_exit ./util_badblock$EXESUFFIX $FULLDEV o
diff --git a/src/test/util_badblock/TEST9 b/src/test/util_badblock/TEST9
index ad43d4c4a..3b85599c7 100755
--- a/src/test/util_badblock/TEST9
+++ b/src/test/util_badblock/TEST9
@@ -64,7 +64,7 @@ turn_on_checking_bad_blocks $FILE
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $FILE -l 0)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# open a pool with bad blocks
expect_abnormal_exit ./util_badblock$EXESUFFIX $FILE o
--
GitLab