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.

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

compat expansion; forge refactor #13302

Merged
merged 35 commits into from
Jun 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ff39282
batch_update_gradually
brianolson May 8, 2024
cd60397
big refactor towards multi-threading
brianolson May 16, 2024
633dca2
upgrade_and_gather_stats() on all phases
brianolson May 16, 2024
e5d5d5e
lock reference fix
brianolson May 17, 2024
0fafd8e
forge re-re-refactor
brianolson May 31, 2024
5980849
try not to create a tokio runtime within a tokio runtime
brianolson Jun 3, 2024
835735b
async fn generate_traffic()
brianolson Jun 4, 2024
0e58a24
Merge remote-tracking branch 'origin/main' into compat2-big-refactor
brianolson Jun 4, 2024
dded354
tweak scope-drop stuff
brianolson Jun 4, 2024
323d334
another try at not recursively breaking tokio runtimes
brianolson Jun 4, 2024
8b1ceda
fmt
brianolson Jun 4, 2024
8d05c3d
async_trait NetworkTest.run
brianolson Jun 6, 2024
ef91fbf
NetworkLoadTest -> async_trait
brianolson Jun 7, 2024
d4d7a91
one less block_on
brianolson Jun 7, 2024
2876d26
less block_on
brianolson Jun 7, 2024
2fd0b98
async contagion spreads
brianolson Jun 7, 2024
38ca3ea
Merge branch 'main' into compat2-big-refactor
brianolson Jun 11, 2024
ce7b718
fix
brianolson Jun 11, 2024
1eb9a05
hack compat duration
brianolson Jun 11, 2024
8a18782
logging
brianolson Jun 11, 2024
36ba070
making parts of Swarm and Node traits &self from &mut self
brianolson Jun 12, 2024
27486a5
swarm loses a bunch of &mut things as mutability goes hidden by inter…
brianolson Jun 12, 2024
9049438
&mut swarm -> Arc<tokio::sync::RwLock<Box<dyn Swarm>>>
brianolson Jun 13, 2024
2a217e5
more async spread
brianolson Jun 17, 2024
1319320
Merge remote-tracking branch 'origin/main' into compat2-big-refactor
brianolson Jun 17, 2024
45c3670
fix
brianolson Jun 17, 2024
b5b119e
cargo lint
brianolson Jun 17, 2024
9d1e7f1
Merge remote-tracking branch 'origin/main' into compat2-big-refactor
brianolson Jun 17, 2024
5f80094
clenup update_seq_num_and_get_num_expired() which got refactored away
brianolson Jun 18, 2024
e6eb7b9
Merge branch 'main' into compat2-big-refactor
brianolson Jun 18, 2024
fc46210
PR cleanup
brianolson Jun 24, 2024
95e73dd
Merge remote-tracking branch 'origin/main' into compat2-big-refactor
brianolson Jun 24, 2024
a6bc708
cleanup
brianolson Jun 24, 2024
ebb0a48
Merge remote-tracking branch 'origin/main' into compat2-big-refactor
brianolson Jun 27, 2024
e138cfb
fix
brianolson Jun 27, 2024
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
Prev Previous commit
Next Next commit
async contagion spreads
brianolson committed Jun 7, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 2fd0b985b4ad0f97f3ab8b15ea27a0872dcb9ba5
28 changes: 14 additions & 14 deletions testsuite/forge/src/interface/network.rs
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ impl<'t> NetworkContext<'t> {
&mut self.core
}

pub fn check_for_success(
pub async fn check_for_success(
&mut self,
stats: &TxnStats,
window: Duration,
@@ -101,19 +101,19 @@ impl<'t> NetworkContext<'t> {
start_version: u64,
end_version: u64,
) -> Result<()> {
self.runtime
.block_on(SuccessCriteriaChecker::check_for_success(
&self.success_criteria,
self.swarm,
self.report,
stats,
window,
latency_breakdown,
start_time,
end_time,
start_version,
end_version,
))
SuccessCriteriaChecker::check_for_success(
&self.success_criteria,
self.swarm,
self.report,
stats,
window,
latency_breakdown,
start_time,
end_time,
start_version,
end_version,
)
.await
}

pub fn handle(&self) -> Handle {
11 changes: 8 additions & 3 deletions testsuite/testcases/src/lib.rs
Original file line number Diff line number Diff line change
@@ -308,6 +308,7 @@ impl NetworkTest for dyn NetworkLoadTest {
start_version,
end_version,
)
.await
.context("check for success")?;
}

@@ -345,7 +346,8 @@ impl dyn NetworkLoadTest + '_ {
}

info!("Starting emitting txns for {}s", duration.as_secs());
let mut job = emitter.start_job(
let mut job = emitter
.start_job(
ctx.swarm().chain_info().root_account,
emit_job_request,
stats_tracking_phases,
@@ -399,7 +401,9 @@ impl dyn NetworkLoadTest + '_ {

let cooldown_used = cooldown_start.elapsed();
if cooldown_used < cooldown_duration {
job = job.periodic_stat_forward(cooldown_duration - cooldown_used, 60).await;
job = job
.periodic_stat_forward(cooldown_duration - cooldown_used, 60)
.await;
}
info!("{}s cooldown finished", cooldown_duration.as_secs());

@@ -430,7 +434,8 @@ impl dyn NetworkLoadTest + '_ {
ctx.swarm(),
phase_timing[i].start_unixtime_s,
phase_timing[i].end_unixtime_s,
).await?;
)
.await?;
info!(
"Latency breakdown details for phase {}: from {} to {}: {:?}",
i,