Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable emptyset processing #233

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Disable emptyset processing #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion crates/corro-agent/src/agent/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,8 @@ fn processing_cost(change: &Changeset) -> usize {
}

/// Handle incoming emptyset received during syncs
///
///_
#[allow(dead_code)]
pub async fn handle_emptyset(
agent: Agent,
bookie: Bookie,
Expand Down Expand Up @@ -472,6 +473,7 @@ pub async fn handle_emptyset(
println!("shutting down handle empties loop");
}

#[allow(dead_code)]
pub async fn process_emptyset(
agent: Agent,
bookie: Bookie,
Expand Down
14 changes: 7 additions & 7 deletions crates/corro-agent/src/agent/run_root.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ async fn run(agent: Agent, opts: AgentOptions, pconf: PerfConfig) -> eyre::Resul
rx_apply,
rx_clear_buf,
rx_changes,
rx_emptyset,
rx_emptyset: _,
rx_foca,
subs_manager,
subs_bcast_cache,
Expand Down Expand Up @@ -218,12 +218,12 @@ async fn run(agent: Agent, opts: AgentOptions, pconf: PerfConfig) -> eyre::Resul
tripwire.clone(),
));

spawn_counted(handlers::handle_emptyset(
agent.clone(),
bookie.clone(),
rx_emptyset,
tripwire.clone(),
));
// spawn_counted(handlers::handle_emptyset(
// agent.clone(),
// bookie.clone(),
// rx_emptyset,
// tripwire.clone(),
// ));

Ok(bookie)
}
78 changes: 39 additions & 39 deletions crates/corro-agent/src/agent/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,52 +845,52 @@ async fn test_clear_empty_versions() -> eyre::Result<()> {

println!("got last cleared - {last_cleared:?}");

// initiate sync with ta1 to get cleared
let res = parallel_sync(
// // initiate sync with ta1 to get cleared
let _ = parallel_sync(
&ta2.agent,
&ta2_transport,
vec![(ta1.agent.actor_id(), ta1.agent.gossip_addr())],
generate_sync(&ta2.bookie, ta2.agent.actor_id()).await,
last_cleared,
)
.await?;

println!("ta2 synced {res}");

sleep(Duration::from_secs(2)).await;

check_bookie_versions(
ta2.clone(),
ta1.agent.actor_id(),
vec![],
vec![],
vec![],
vec![
Version(1)..=Version(5),
Version(10)..=Version(10),
Version(23)..=Version(25),
Version(30)..=Version(31),
],
)
.await?;

// ta2 should have ta1's last cleared
let ta1_cleared = ta1
.agent
.booked()
.read("test_clear_empty")
.await
.last_cleared_ts();
let ta2_ta1_cleared = ta2
.bookie
.write("test")
.await
.ensure(ta1.agent.actor_id())
.read("test_clear_empty")
.await
.last_cleared_ts();

assert_eq!(ta1_cleared, ta2_ta1_cleared);
//
// println!("ta2 synced {res}");
//
// sleep(Duration::from_secs(2)).await;
//
// check_bookie_versions(
// ta2.clone(),
// ta1.agent.actor_id(),
// vec![],
// vec![],
// vec![],
// vec![
// Version(1)..=Version(5),
// Version(10)..=Version(10),
// Version(23)..=Version(25),
// Version(30)..=Version(31),
// ],
// )
// .await?;
//
// // ta2 should have ta1's last cleared
// let ta1_cleared = ta1
// .agent
// .booked()
// .read("test_clear_empty")
// .await
// .last_cleared_ts();
// let ta2_ta1_cleared = ta2
// .bookie
// .write("test")
// .await
// .ensure(ta1.agent.actor_id())
// .read("test_clear_empty")
// .await
// .last_cleared_ts();
//
// assert_eq!(ta1_cleared, ta2_ta1_cleared);

tripwire_tx.send(()).await.ok();
tripwire_worker.await;
Expand Down
16 changes: 8 additions & 8 deletions crates/corro-agent/src/api/peer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,7 +1374,7 @@ pub async fn parallel_sync(

let counts = FuturesUnordered::from_iter(readers.into_iter().map(|(actor_id, mut read)| {
let tx_changes = agent.tx_changes().clone();
let tx_emptyset = agent.tx_emptyset().clone();
// let tx_emptyset = agent.tx_emptyset().clone();

async move {
let mut count = 0;
Expand Down Expand Up @@ -1402,13 +1402,13 @@ pub async fn parallel_sync(
change.seqs()
);
// only accept emptyset that's from the same node that's syncing
if change.is_empty_set() {
tx_emptyset
.send(change)
.await
.map_err(|_| SyncRecvError::ChangesChannelClosed)?;
continue;
}
// if change.is_empty_set() {
// tx_emptyset
// .send(change)
// .await
// .map_err(|_| SyncRecvError::ChangesChannelClosed)?;
// continue;
// }

tx_changes
.send((change, ChangeSource::Sync))
Expand Down
Loading