Lochnair-Labs/irtt-rs
2
0 Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

fix(client): replace deferred open stop with immediate cancellation
Rust CI / cargo fmt (push) Successful in 16s
Details
Rust CI / cargo check (x86_64-unknown-linux-musl) (push) Failing after 11s
Details
Rust CI / cargo check (x86_64-unknown-linux-gnu) (push) Successful in 35s
Details
Rust CI / cargo test (x86_64-unknown-linux-musl) (push) Failing after 8s
Details
Rust CI / cargo clippy (push) Successful in 35s
Details
Netem Interop / netem interop (push) Failing after 17s
Details
Supply chain / cargo-deny advisories (push) Failing after 4s
Details
Supply chain / cargo-deny bans licenses sources (push) Failing after 3s
Details
Rust CI / cargo doc (push) Successful in 30s
Details
Supply chain / actionlint (push) Successful in 4s
Details
Fuzz Smoke / cargo fuzz smoke (push) Failing after 34s
Details
Rust CI / cargo test (x86_64-unknown-linux-gnu) (push) Successful in 1m16s
Details

Browse Source
This commit is contained in:
Nils Andreas Svee committed 2026-10-21 23:50:14 +07:00
1 parent d2a7acdec4
commit 52f2a07490
2 files changed
+26 -78
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/irtt-client/src/managed/task/target.rs
+16 -55
View File
@@ -409,12 +409,12 @@ impl ManagedClientTask {
let retirement = retirement
.clone()
.unwrap_or(ManagedTargetEndReason::Stopped);
if !open.has_in_flight_work() {
self.targets[index].sync_live_packets_sent();
self.finish_target(index, retirement, None);
return false;
}
open.request_stop_after_current_attempt();
let cleanup_failure = client.cancel_open(open).map(|error| {
classify_client_error(ManagedTargetFailurePhase::Opening, &error)
});
self.targets[index].sync_live_packets_sent();
self.finish_target(index, retirement, cleanup_failure);
return false;
}
match client.poll_open(open, cx) {
Poll::Pending => false,
@@ -438,64 +438,25 @@ impl ManagedClientTask {
index,
vec![ClientEvent::SessionStarted(started)],
);
if stopping {
self.targets[index].sync_live_packets_sent();
self.begin_drain(
index,
retirement
.clone()
.unwrap_or(ManagedTargetEndReason::Stopped),
now,
)
} else {
let previous = self.targets[index].take_phase();
self.targets[index].restore_phase(TargetPhase::Active {
client: previous.into_client(),
schedule,
send_waiting: false,
});
self.publish_target_phase(index, ManagedTargetLifecycle::Opening);
true
}
let previous = self.targets[index].take_phase();
self.targets[index].restore_phase(TargetPhase::Active {
client: previous.into_client(),
schedule,
send_waiting: false,
});
self.publish_target_phase(index, ManagedTargetLifecycle::Opening);
true
}
Poll::Ready(Ok(OpenOutcome::NoTestCompleted(completed))) => {
self.publish_client_events(
index,
vec![ClientEvent::NoTestCompleted(completed)],
);
let end_reason = if stopping {
retirement
.clone()
.unwrap_or(ManagedTargetEndReason::Stopped)
} else {
ManagedTargetEndReason::NoTestComplete
};
self.finish_target(index, end_reason, None);
self.finish_target(index, ManagedTargetEndReason::NoTestComplete, None);
false
}
Poll::Ready(Err(error)) => {
if stopping {
let TargetPhase::Opening { open, .. } = self.targets[index].phase()
else {
unreachable!()
};
let cleanup_failure =
(!open.stopped_after_current_attempt()).then(|| {
classify_client_error(
ManagedTargetFailurePhase::Opening,
&error,
)
});
self.finish_target(
index,
retirement
.clone()
.unwrap_or(ManagedTargetEndReason::Stopped),
cleanup_failure,
);
} else {
self.fail_target(index, ManagedTargetFailurePhase::Opening, error);
}
self.fail_target(index, ManagedTargetFailurePhase::Opening, error);
false
}
}