From a5aaadacbd85785a830005d22c4930a9d80f4e68 Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Tue, 11 Mar 2025 10:08:44 +0530 Subject: [PATCH] qa/workunits/rbd: required changes to expect state to up+unknown Signed-off-by: Prasanna Kumar Kalever --- qa/workunits/rbd/rbd_mirror_group.sh | 20 ++++++++++---------- qa/workunits/rbd/rbd_mirror_group_simple.sh | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qa/workunits/rbd/rbd_mirror_group.sh b/qa/workunits/rbd/rbd_mirror_group.sh index 3fcaaa2f40380..cbe26436004df 100755 --- a/qa/workunits/rbd/rbd_mirror_group.sh +++ b/qa/workunits/rbd/rbd_mirror_group.sh @@ -259,8 +259,8 @@ mirror_group_demote ${CLUSTER2} ${POOL}/${group1} test_fields_in_group_info ${CLUSTER2} ${POOL}/${group1} 'snapshot' 'enabled' 'false' wait_for_group_replay_stopped ${CLUSTER1} ${POOL}/${group1} -wait_for_group_status_in_pool_dir ${CLUSTER1} ${POOL}/${group1} 'up+stopped' 0 -wait_for_group_status_in_pool_dir ${CLUSTER2} ${POOL}/${group1} 'up+stopped' 0 +wait_for_group_status_in_pool_dir ${CLUSTER1} ${POOL}/${group1} 'up+unknown' 0 +wait_for_group_status_in_pool_dir ${CLUSTER2} ${POOL}/${group1} 'up+unknown' 0 mirror_group_promote ${CLUSTER2} ${POOL}/${group1} test_fields_in_group_info ${CLUSTER2} ${POOL}/${group1} 'snapshot' 'enabled' 'true' @@ -274,8 +274,8 @@ testlog " - failover (unmodified)" mirror_group_demote ${CLUSTER2} ${POOL}/${group} test_fields_in_group_info ${CLUSTER2} ${POOL}/${group} 'snapshot' 'enabled' 'false' wait_for_group_replay_stopped ${CLUSTER1} ${POOL}/${group} -wait_for_group_status_in_pool_dir ${CLUSTER1} ${POOL}/${group} 'up+stopped' 0 -wait_for_group_status_in_pool_dir ${CLUSTER2} ${POOL}/${group} 'up+stopped' 0 +wait_for_group_status_in_pool_dir ${CLUSTER1} ${POOL}/${group} 'up+unknown' 0 +wait_for_group_status_in_pool_dir ${CLUSTER2} ${POOL}/${group} 'up+unknown' 0 mirror_group_promote ${CLUSTER1} ${POOL}/${group} test_fields_in_group_info ${CLUSTER1} ${POOL}/${group} 'snapshot' 'enabled' 'true' wait_for_group_replay_started ${CLUSTER2} ${POOL}/${group} 1 @@ -284,8 +284,8 @@ testlog " - failback (unmodified)" mirror_group_demote ${CLUSTER1} ${POOL}/${group} test_fields_in_group_info ${CLUSTER1} ${POOL}/${group} 'snapshot' 'enabled' 'false' wait_for_group_replay_stopped ${CLUSTER2} ${POOL}/${group} -wait_for_group_status_in_pool_dir ${CLUSTER1} ${POOL}/${group} 'up+stopped' 0 -wait_for_group_status_in_pool_dir ${CLUSTER2} ${POOL}/${group} 'up+stopped' 0 +wait_for_group_status_in_pool_dir ${CLUSTER1} ${POOL}/${group} 'up+unknown' 0 +wait_for_group_status_in_pool_dir ${CLUSTER2} ${POOL}/${group} 'up+unknown' 0 mirror_group_promote ${CLUSTER2} ${POOL}/${group} test_fields_in_group_info ${CLUSTER2} ${POOL}/${group} 'snapshot' 'enabled' 'true' wait_for_group_replay_started ${CLUSTER1} ${POOL}/${group} 1 @@ -298,8 +298,8 @@ testlog " - failover" mirror_group_demote ${CLUSTER2} ${POOL}/${group1} test_fields_in_group_info ${CLUSTER2} ${POOL}/${group1} 'snapshot' 'enabled' 'false' wait_for_group_replay_stopped ${CLUSTER1} ${POOL}/${group1} -wait_for_group_status_in_pool_dir ${CLUSTER1} ${POOL}/${group1} 'up+stopped' 0 -wait_for_group_status_in_pool_dir ${CLUSTER2} ${POOL}/${group1} 'up+stopped' 0 +wait_for_group_status_in_pool_dir ${CLUSTER1} ${POOL}/${group1} 'up+unknown' 0 +wait_for_group_status_in_pool_dir ${CLUSTER2} ${POOL}/${group1} 'up+unknown' 0 mirror_group_promote ${CLUSTER1} ${POOL}/${group1} test_fields_in_group_info ${CLUSTER1} ${POOL}/${group1} 'snapshot' 'enabled' 'true' wait_for_group_replay_started ${CLUSTER2} ${POOL}/${group1} 1 @@ -313,8 +313,8 @@ testlog " - failback to cluster2" mirror_group_demote ${CLUSTER1} ${POOL}/${group1} test_fields_in_group_info ${CLUSTER1} ${POOL}/${group1} 'snapshot' 'enabled' 'false' wait_for_group_replay_stopped ${CLUSTER2} ${POOL}/${group1} -wait_for_group_status_in_pool_dir ${CLUSTER1} ${POOL}/${group1} 'up+stopped' 0 -wait_for_group_status_in_pool_dir ${CLUSTER2} ${POOL}/${group1} 'up+stopped' 0 +wait_for_group_status_in_pool_dir ${CLUSTER1} ${POOL}/${group1} 'up+unknown' 0 +wait_for_group_status_in_pool_dir ${CLUSTER2} ${POOL}/${group1} 'up+unknown' 0 mirror_group_promote ${CLUSTER2} ${POOL}/${group1} test_fields_in_group_info ${CLUSTER2} ${POOL}/${group1} 'snapshot' 'enabled' 'true' wait_for_group_replay_started ${CLUSTER1} ${POOL}/${group1} 1 diff --git a/qa/workunits/rbd/rbd_mirror_group_simple.sh b/qa/workunits/rbd/rbd_mirror_group_simple.sh index 7b6db746e87ce..e011ce6f8f1ea 100755 --- a/qa/workunits/rbd/rbd_mirror_group_simple.sh +++ b/qa/workunits/rbd/rbd_mirror_group_simple.sh @@ -800,7 +800,7 @@ test_remote_namespace() mirror_group_demote "${primary_cluster}" "${primary_pool_spec}/${group}" test_fields_in_group_info "${primary_cluster}" "${primary_pool_spec}/${group}" 'snapshot' 'enabled' 'false' wait_for_group_replay_stopped "${secondary_cluster}" "${secondary_pool_spec}/${group}" - wait_for_group_status_in_pool_dir "${secondary_cluster}" "${secondary_pool_spec}/${group}" 'up+stopped' 0 + wait_for_group_status_in_pool_dir "${secondary_cluster}" "${secondary_pool_spec}/${group}" 'up+unknown' 0 wait_for_group_status_in_pool_dir "${primary_cluster}" "${primary_pool_spec}/${group}" 'down+unknown' 0 mirror_group_promote "${secondary_cluster}" "${secondary_pool_spec}/${group}" test_fields_in_group_info "${secondary_cluster}" "${secondary_pool_spec}/${group}" 'snapshot' 'enabled' 'true' -- 2.39.5