From 217c1d2bb2f0ab76cbf60be1e0917852640ed092 Mon Sep 17 00:00:00 2001 From: Nikhilkumar Shelke Date: Tue, 28 Jun 2022 16:43:13 +0530 Subject: [PATCH] qa/workunits/cephtool: check_response didn't find erasure-code string 1. If data or metadata pool is already in-use by filesystem then it is not allowed to reuse the same pool for another filesystems. 2. Test is failing because above(1) restrictions/checks comes before checking erasure-code pools. Hence test is failing and not finding expected error string in output. 3. Proposed fix checks newly added error string instead of 'erasure-code'. 4. Also adding new tests to verify string 'erasure-code' by passing --force option so that check for pools reuse(1) will be skipped and check for 'erasure-code' will be hit. Fixes: https://tracker.ceph.com/issues/56384 Signed-off-by: Nikhilkumar Shelke --- qa/workunits/cephtool/test.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index 6ee0e5aec2939..13690af4b5d87 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -1028,6 +1028,8 @@ function test_mon_mds() ceph fs new $FS_NAME fs_metadata mds-ec-pool --force 2>$TMPFILE check_response 'erasure-code' $? 22 ceph fs new $FS_NAME mds-ec-pool fs_data 2>$TMPFILE + check_response 'already used by filesystem' $? 22 + ceph fs new $FS_NAME mds-ec-pool fs_data --force 2>$TMPFILE check_response 'erasure-code' $? 22 ceph fs new $FS_NAME mds-ec-pool mds-ec-pool 2>$TMPFILE check_response 'erasure-code' $? 22 @@ -1067,8 +1069,12 @@ function test_mon_mds() ceph fs new $FS_NAME fs_metadata mds-tier --force 2>$TMPFILE check_response 'in use as a cache tier' $? 22 ceph fs new $FS_NAME mds-tier fs_data 2>$TMPFILE + check_response 'already used by filesystem' $? 22 + ceph fs new $FS_NAME mds-tier fs_data --force 2>$TMPFILE check_response 'in use as a cache tier' $? 22 ceph fs new $FS_NAME mds-tier mds-tier 2>$TMPFILE + check_response 'already used by filesystem' $? 22 + ceph fs new $FS_NAME mds-tier mds-tier --force 2>$TMPFILE check_response 'in use as a cache tier' $? 22 set -e @@ -1099,6 +1105,8 @@ function test_mon_mds() # ...but not as the metadata pool set +e ceph fs new $FS_NAME mds-ec-pool fs_data 2>$TMPFILE + check_response 'already used by filesystem' $? 22 + ceph fs new $FS_NAME mds-ec-pool fs_data --force 2>$TMPFILE check_response 'erasure-code' $? 22 set -e -- 2.39.5