diff --git a/test_suite/default-switch2primary.conf b/test_suite/default-switch2primary.conf index 06d988e3..6c4d4be3 100644 --- a/test_suite/default-switch2primary.conf +++ b/test_suite/default-switch2primary.conf @@ -75,7 +75,7 @@ switch2primary_logrotate_split_brain_orig_secondary=0 ## flags whether marsadm log-rotate and log-delete should be called during ## the test of the new primary ## primary resp. secondary -switch2primary_logrotate_new_primary=0 +switch2primary_logrotate_new_primary=1 ## prefix of the name of the script, which writes some data on ## the data devices of the both primaries diff --git a/test_suite/scripts/modules/65_switch2primary.sh b/test_suite/scripts/modules/65_switch2primary.sh index 9d8db28f..9fa18709 100644 --- a/test_suite/scripts/modules/65_switch2primary.sh +++ b/test_suite/scripts/modules/65_switch2primary.sh @@ -125,7 +125,7 @@ function switch2primary_run # switch2primary_orig_prim_equal_new_prim = 0 # ---- the replication should work now with original roles if # switch2primary_orig_prim_equal_new_prim = 0 and after -# marsadm primary --force on orig_primary +# marsadm primary on orig_primary # Otherwise we should have a real split brain and should be able to write on # both data devices. The process flow continues: # @@ -170,9 +170,8 @@ function switch2primary_force lib_vmsg " ${FUNCNAME[0]}: write_count: $write_count" if [ $switch2primary_orig_primary_alive -eq 1 ]; then -# TODO: remove superfluous test cases if [ $switch2primary_orig_prim_equal_new_prim -eq 1 ]; then - marsadm_do_cmd $new_primary "--force primary" "$res" || lib_exit 1 + marsadm_do_cmd $new_primary "primary" "$res" || lib_exit 1 fi switch2primary_check_replication $new_primary $new_secondary $res return diff --git a/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/hardcore_method/empty b/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/empty similarity index 100% rename from test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/hardcore_method/empty rename to test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/empty diff --git a/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/usual_method/empty b/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/secon_becomes_prim/empty similarity index 100% rename from test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/usual_method/empty rename to test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/secon_becomes_prim/empty diff --git a/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/secon_becomes_prim/hardcore_method/empty b/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/empty similarity index 100% rename from test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/secon_becomes_prim/hardcore_method/empty rename to test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/empty diff --git a/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/secon_becomes_prim/usual_method/empty b/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/empty similarity index 100% rename from test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_in_use/secon_becomes_prim/usual_method/empty rename to test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/empty diff --git a/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/hardcore_method/empty b/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/hardcore_method/empty deleted file mode 100644 index e69de29b..00000000 diff --git a/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/usual_method/empty b/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/usual_method/empty deleted file mode 100644 index e69de29b..00000000 diff --git a/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/hardcore_method/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/empty similarity index 100% rename from test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/hardcore_method/empty rename to test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/empty diff --git a/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/hardcore_method/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/hardcore_method/empty deleted file mode 100644 index e69de29b..00000000 diff --git a/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/usual_method/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/orig_prim_becomes_prim/usual_method/empty deleted file mode 100644 index e69de29b..00000000 diff --git a/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/hardcore_method/logrot_new_prim/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/secon_becomes_prim/empty similarity index 100% rename from test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/hardcore_method/logrot_new_prim/empty rename to test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/secon_becomes_prim/empty diff --git a/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/secon_becomes_prim/hardcore_method/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/secon_becomes_prim/hardcore_method/empty deleted file mode 100644 index e69de29b..00000000 diff --git a/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/secon_becomes_prim/usual_method/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_in_use/secon_becomes_prim/usual_method/empty deleted file mode 100644 index e69de29b..00000000 diff --git a/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/usual_method/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/empty similarity index 100% rename from test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/usual_method/empty rename to test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/empty diff --git a/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/hardcore_method/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/hardcore_method/empty deleted file mode 100644 index e69de29b..00000000 diff --git a/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/usual_method/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/usual_method/empty deleted file mode 100644 index e69de29b..00000000 diff --git a/test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/usual_method/logrot_new_prim/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/empty similarity index 100% rename from test_suite/test_cases/admin/switch2primary_force/logrot_orig_prim/orig_prim_alive/data_dev_not_in_use/orig_prim_becomes_prim/usual_method/logrot_new_prim/empty rename to test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/empty diff --git a/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/hardcore_method/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/hardcore_method/empty deleted file mode 100644 index e69de29b..00000000 diff --git a/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/usual_method/empty b/test_suite/test_cases/admin/switch2primary_force/orig_prim_alive/data_dev_not_in_use/secon_becomes_prim/usual_method/empty deleted file mode 100644 index e69de29b..00000000