diff --git a/tests/tests/client_api/t50_lagging_network_write.rs b/tests/tests/client_api/t50_lagging_network_write.rs index 98c6e12e4..29214dc0f 100644 --- a/tests/tests/client_api/t50_lagging_network_write.rs +++ b/tests/tests/client_api/t50_lagging_network_write.rs @@ -39,7 +39,7 @@ async fn lagging_network_write() -> Result<()> { router.wait_for_log(&btreeset![0, 1, 2], Some(log_index), timeout(), "write one log").await?; let node = router.get_raft_handle(&0)?; - node.change_membership(btreeset![0, 1, 2], false).await?; + node.change_membership([0, 1, 2], false).await?; log_index += 2; router.wait_for_state(&btreeset![0], ServerState::Leader, None, "changed").await?; router.wait_for_state(&btreeset![1, 2], ServerState::Follower, None, "changed").await?; diff --git a/tests/tests/membership/t11_add_learner.rs b/tests/tests/membership/t11_add_learner.rs index c60f2deb7..b2da38aa6 100644 --- a/tests/tests/membership/t11_add_learner.rs +++ b/tests/tests/membership/t11_add_learner.rs @@ -212,7 +212,7 @@ async fn add_learner_when_previous_membership_not_committed() -> Result<()> { let node = router.get_raft_handle(&0)?; tokio::spawn(async move { - let res = node.change_membership(btreeset![0, 1], false).await; + let res = node.change_membership([0, 1], false).await; tracing::info!("do not expect res: {:?}", res); unreachable!("do not expect any res"); }); @@ -272,7 +272,7 @@ async fn check_learner_after_leader_transferred() -> Result<()> { router.wait_for_log(&btreeset![0, 1], Some(log_index), timeout(), "add learner").await?; let node = router.get_raft_handle(&orig_leader_id)?; - node.change_membership(btreeset![1, 3, 4], false).await?; + node.change_membership([1, 3, 4], false).await?; log_index += 2; // 2 change_membership log tracing::info!(log_index, "--- old leader commits 2 membership log"); diff --git a/tests/tests/membership/t20_change_membership.rs b/tests/tests/membership/t20_change_membership.rs index dab26ec8c..a44904759 100644 --- a/tests/tests/membership/t20_change_membership.rs +++ b/tests/tests/membership/t20_change_membership.rs @@ -29,7 +29,7 @@ async fn update_membership_state() -> anyhow::Result<()> { tracing::info!(log_index, "--- change membership from 012 to 01234"); { let leader = router.get_raft_handle(&0)?; - let res = leader.change_membership(btreeset! {0,1,2,3,4}, false).await?; + let res = leader.change_membership([0, 1, 2, 3, 4], false).await?; log_index += 2; tracing::info!(log_index, "--- change_membership blocks until success: {:?}", res); @@ -84,7 +84,7 @@ async fn change_with_new_learner_blocking() -> anyhow::Result<()> { router.wait_for_log(&btreeset![0], Some(log_index), timeout(), "add learner").await?; let node = router.get_raft_handle(&0)?; - let res = node.change_membership(btreeset! {0,1}, false).await?; + let res = node.change_membership([0, 1], false).await?; log_index += 2; tracing::info!(log_index, "--- change_membership blocks until success: {:?}", res); @@ -116,7 +116,7 @@ async fn change_without_adding_learner() -> anyhow::Result<()> { "--- change membership without adding-learner, allow_lagging=true" ); { - let res = leader.change_membership(btreeset! {0,1}, false).await; + let res = leader.change_membership([0, 1], false).await; let raft_err = res.unwrap_err(); tracing::debug!("raft_err: {:?}", raft_err); @@ -132,7 +132,7 @@ async fn change_without_adding_learner() -> anyhow::Result<()> { tracing::info!(log_index, "--- change membership without adding-learner"); { - let res = leader.change_membership(btreeset! {0,1}, false).await; + let res = leader.change_membership([0, 1], false).await; let raft_err = res.unwrap_err(); match raft_err.api_error().unwrap() { ClientWriteError::ChangeMembershipError(ChangeMembershipError::LearnerNotFound(err)) => { @@ -173,7 +173,7 @@ async fn change_with_turn_removed_voter_to_learner() -> anyhow::Result<()> { { let node = router.get_raft_handle(&0)?; - node.change_membership(btreeset![0, 1], true).await?; + node.change_membership([0, 1], true).await?; // 2 for change_membership log_index += 2; diff --git a/tests/tests/membership/t30_commit_joint_config.rs b/tests/tests/membership/t30_commit_joint_config.rs index 55128fd0c..ad73e381c 100644 --- a/tests/tests/membership/t30_commit_joint_config.rs +++ b/tests/tests/membership/t30_commit_joint_config.rs @@ -68,7 +68,7 @@ async fn commit_joint_config_during_0_to_012() -> Result<()> { let router = router.clone(); async move { let node = router.get_raft_handle(&0).unwrap(); - let _x = node.change_membership(btreeset! {0,1,2}, false).await; + let _x = node.change_membership([0, 1, 2], false).await; } .instrument(tracing::debug_span!("spawn-change-membership")) }); @@ -115,7 +115,7 @@ async fn commit_joint_config_during_012_to_234() -> Result<()> { tracing::info!(log_index, "--- changing config to 0,1,2"); let node = router.get_raft_handle(&0)?; - node.change_membership(btreeset![0, 1, 2], false).await?; + node.change_membership([0, 1, 2], false).await?; log_index += 2; router.wait_for_log(&btreeset![0, 1, 2], Some(log_index), None, "cluster of 0,1,2").await?; @@ -127,7 +127,7 @@ async fn commit_joint_config_during_012_to_234() -> Result<()> { tokio::spawn( async move { let node = router.get_raft_handle(&0)?; - node.change_membership(btreeset![2, 3, 4], false).await?; + node.change_membership([2, 3, 4], false).await?; Ok::<(), anyhow::Error>(()) } .instrument(tracing::debug_span!("spawn-change-membership")), diff --git a/tests/tests/membership/t31_remove_leader.rs b/tests/tests/membership/t31_remove_leader.rs index e7249b507..f2a475a9b 100644 --- a/tests/tests/membership/t31_remove_leader.rs +++ b/tests/tests/membership/t31_remove_leader.rs @@ -42,7 +42,7 @@ async fn remove_leader() -> Result<()> { router.wait_for_log(&btreeset![0, 1], Some(log_index), timeout(), "add learner").await?; let node = router.get_raft_handle(&orig_leader)?; - node.change_membership(btreeset![1, 2, 3], false).await?; + node.change_membership([1, 2, 3], false).await?; // 2 for change_membership log_index += 2; @@ -133,7 +133,7 @@ async fn remove_leader_and_convert_to_learner() -> Result<()> { tracing::info!(log_index, "--- change membership and retain removed node as learner"); { let node = router.get_raft_handle(&old_leader)?; - node.change_membership(btreeset![1, 2, 3], true).await?; + node.change_membership([1, 2, 3], true).await?; log_index += 2; } @@ -195,7 +195,7 @@ async fn remove_leader_access_new_cluster() -> Result<()> { tracing::info!(log_index, "--- change membership 012 to 2"); { let node = router.get_raft_handle(&orig_leader)?; - node.change_membership(btreeset![2], false).await?; + node.change_membership([2], false).await?; // 2 change_membership logs log_index += 2; diff --git a/tests/tests/membership/t31_removed_follower.rs b/tests/tests/membership/t31_removed_follower.rs index bb508e97e..d905b8111 100644 --- a/tests/tests/membership/t31_removed_follower.rs +++ b/tests/tests/membership/t31_removed_follower.rs @@ -37,7 +37,7 @@ async fn stop_replication_to_removed_follower() -> Result<()> { tracing::info!(log_index, "--- changing config to 0,3,4"); { let node = router.get_raft_handle(&0)?; - node.change_membership(btreeset![0, 3, 4], false).await?; + node.change_membership([0, 3, 4], false).await?; log_index += 2; for i in [0, 3, 4] { diff --git a/tests/tests/membership/t51_remove_unreachable_follower.rs b/tests/tests/membership/t51_remove_unreachable_follower.rs index 9d43e810b..17a3582e3 100644 --- a/tests/tests/membership/t51_remove_unreachable_follower.rs +++ b/tests/tests/membership/t51_remove_unreachable_follower.rs @@ -36,7 +36,7 @@ async fn stop_replication_to_removed_unreachable_follower_network_failure() -> R tracing::info!(log_index, "--- changing config to 0,1,2"); { let node = router.get_raft_handle(&0)?; - node.change_membership(btreeset![0, 1, 2], false).await?; + node.change_membership([0, 1, 2], false).await?; log_index += 2; for i in &[0, 1, 2] { diff --git a/tests/tests/membership/t99_issue_584_replication_state_reverted.rs b/tests/tests/membership/t99_issue_584_replication_state_reverted.rs index d83d53ed5..4bb89bea2 100644 --- a/tests/tests/membership/t99_issue_584_replication_state_reverted.rs +++ b/tests/tests/membership/t99_issue_584_replication_state_reverted.rs @@ -43,7 +43,7 @@ async fn t99_issue_584_replication_state_reverted() -> Result<()> { ); { let leader = router.get_raft_handle(&0)?; - leader.change_membership(btreeset![0, 1], false).await?; + leader.change_membership([0, 1], false).await?; log_index += 2; // 2 change_membership log let _ = log_index; diff --git a/tests/tests/snapshot_streaming/t90_issue_808_snapshot_to_unreachable_node_should_not_block.rs b/tests/tests/snapshot_streaming/t90_issue_808_snapshot_to_unreachable_node_should_not_block.rs index f239f26fb..83a81e7be 100644 --- a/tests/tests/snapshot_streaming/t90_issue_808_snapshot_to_unreachable_node_should_not_block.rs +++ b/tests/tests/snapshot_streaming/t90_issue_808_snapshot_to_unreachable_node_should_not_block.rs @@ -51,7 +51,7 @@ async fn snapshot_to_unreachable_node_should_not_block() -> Result<()> { "--- change membership to {{0}}, replication should be closed and re-spawned, snapshot streaming should stop at once" ); { - n0.change_membership(btreeset! {0}, true).await?; + n0.change_membership([0], true).await?; n0.wait(timeout()).voter_ids([0], "change membership to {{0}}").await?; } diff --git a/tests/tests/state_machine/t20_state_machine_apply_membership.rs b/tests/tests/state_machine/t20_state_machine_apply_membership.rs index 875d80196..2a6712eb7 100644 --- a/tests/tests/state_machine/t20_state_machine_apply_membership.rs +++ b/tests/tests/state_machine/t20_state_machine_apply_membership.rs @@ -68,7 +68,7 @@ async fn state_machine_apply_membership() -> Result<()> { tracing::info!(log_index, "--- changing cluster config"); let node = router.get_raft_handle(&0)?; - node.change_membership(btreeset![0, 1, 2], false).await?; + node.change_membership([0, 1, 2], false).await?; log_index += 2;