Move iroh_driver and the relay binary out of distribution into a dedicated crates/iroh-driver (lib re-exports IrohDriver; relay bin renamed). Remove the node crate and the single-gpu-inference example; drop the docker/datastream demo. Slim pipeline-parallel vastai. Signed-off-by: Zachery Aaron Shores-Chmielewski <zacheryasc@gmail.com>
543 lines
19 KiB
Rust
543 lines
19 KiB
Rust
//! T-cluster: N-node iroh cluster + actor-level message exchange.
|
||
//!
|
||
//! Covers TEST_SPEC §8. One node per orchestrator and one per pipeline
|
||
//! stage, joined via the orchestrator as the seed, exercised for
|
||
//! `NUM_STAGES ∈ {2, 3, 4}` in `RelayMode::Disabled` so the tests run
|
||
//! offline and without a GPU.
|
||
//!
|
||
//! For each N the tests assert:
|
||
//!
|
||
//! 1. The cluster converges (every node sees every other peer alive).
|
||
//! 2. Every adjacent stage pair `(i → i+1)` carries `StageActivation`
|
||
//! intact in the pipeline's forward direction.
|
||
//! 3. `NextToken` reaches stage 0 from the last stage (the autoregressive
|
||
//! feedback edge — middle stages are skipped on the wire).
|
||
//! 4. `InferenceResponse` reaches the orchestrator from the last stage.
|
||
//! 5. SWIM detects the death of a stage regardless of role (first,
|
||
//! middle, last).
|
||
|
||
use std::sync::{Arc, Mutex, MutexGuard, OnceLock};
|
||
use std::time::{Duration, Instant};
|
||
|
||
/// Process-wide lock that serialises whole test bodies in this binary.
|
||
/// SWIM convergence at N≥4 is fast in isolation but degrades sharply
|
||
/// when several parallel tests are also pumping their own clusters of
|
||
/// iroh drivers. Each test holds the guard for its full lifetime
|
||
/// (cluster build + send/receive + shutdown), so fan-out across the
|
||
/// binary is at most one cluster at a time. Total wall-clock is bounded
|
||
/// by the per-test cost (~3s × 14 tests).
|
||
static CLUSTER_LOCK: OnceLock<Mutex<()>> = OnceLock::new();
|
||
|
||
fn acquire_cluster_lock() -> MutexGuard<'static, ()> {
|
||
CLUSTER_LOCK
|
||
.get_or_init(|| Mutex::new(()))
|
||
.lock()
|
||
.unwrap_or_else(|poisoned| poisoned.into_inner())
|
||
}
|
||
|
||
use distribution::node::DistributedNodeConfig;
|
||
use distribution::registry::RegistryConfig;
|
||
use distribution::swim::probe::SwimConfig;
|
||
use iroh::{PublicKey, RelayMode};
|
||
use iroh_driver::IrohDriverConfig;
|
||
|
||
use swactor::actor::{ActorAddress, Message};
|
||
use swactor::runtime::{Runtime, RuntimeConfig};
|
||
use swactor_transport::{CodecRegistry, TransportRouter};
|
||
|
||
use pipeline_parallel_inference::cluster::ClusterNode;
|
||
use pipeline_parallel_inference::iroh_transport::{
|
||
ACTOR_ALPN, IrohActorTransport, drain_actor_messages,
|
||
};
|
||
use pipeline_parallel_inference::messages::{
|
||
InferenceResponse, NextToken, StageActivation, inference_codec_registry,
|
||
};
|
||
|
||
// ── Driver config (mirrors single-GPU t_cluster) ─────────────────────────
|
||
|
||
/// Small-cluster tuning: tight enough probe/suspicion windows for §8 death
|
||
/// detection to land within ~2 s, loose enough that a serial pump fanning
|
||
/// SWIM across N+1 nodes doesn't false-suspect during convergence.
|
||
/// Time-to-Dead ≈ 2*probe_timeout + suspicion_timeout = 0.9 s.
|
||
fn test_node_config() -> DistributedNodeConfig {
|
||
DistributedNodeConfig {
|
||
swim: SwimConfig {
|
||
probe_interval: Duration::from_millis(20),
|
||
probe_timeout: Duration::from_millis(200),
|
||
indirect_probes: 1,
|
||
suspicion_timeout: Duration::from_millis(500),
|
||
dead_reprobe_interval: Duration::ZERO,
|
||
..SwimConfig::default()
|
||
},
|
||
cache_capacity: 100,
|
||
registry: RegistryConfig::default(),
|
||
metadata_lambda: 3,
|
||
}
|
||
}
|
||
|
||
/// SWIM config for large local clusters. The small-N config above uses
|
||
/// extremely tight probe/suspicion windows so the 2..4 tests detect a
|
||
/// killed node within a second or two. A single-threaded harness pumps
|
||
/// every node serially per loop iteration — at a dozen nodes the initial
|
||
/// burst of all-pairs iroh/QUIC connection setup pushes ack latency past
|
||
/// those windows, every node falsely suspects its peers, and membership
|
||
/// collapses instead of converging. Widening the windows removes the
|
||
/// false positives so convergence is reached, without changing the
|
||
/// protocol under test.
|
||
fn large_cluster_node_config() -> DistributedNodeConfig {
|
||
DistributedNodeConfig {
|
||
swim: SwimConfig {
|
||
// Probe every 10ms so membership gossip (piggybacked on
|
||
// ping/ack) spreads as fast as the serial pump allows.
|
||
probe_interval: Duration::from_millis(10),
|
||
// Failure detection is irrelevant to a *convergence* test, and
|
||
// false positives are what break it at scale. Set the probe and
|
||
// suspicion windows far beyond the test's wall-clock budget so a
|
||
// peer, once seen alive, is never falsely suspected.
|
||
probe_timeout: Duration::from_secs(3600),
|
||
indirect_probes: 2,
|
||
suspicion_timeout: Duration::from_secs(3600),
|
||
dead_reprobe_interval: Duration::from_millis(500),
|
||
..SwimConfig::default()
|
||
},
|
||
cache_capacity: 100,
|
||
registry: RegistryConfig::default(),
|
||
metadata_lambda: 3,
|
||
}
|
||
}
|
||
|
||
fn make_node() -> ClusterNode {
|
||
make_node_with(test_node_config())
|
||
}
|
||
|
||
fn make_node_with(node_cfg: DistributedNodeConfig) -> ClusterNode {
|
||
ClusterNode::new(
|
||
IrohDriverConfig {
|
||
secret_key: None,
|
||
relay_mode: RelayMode::Disabled,
|
||
node: node_cfg.clone(),
|
||
peer_auth: None,
|
||
additional_alpns: vec![ACTOR_ALPN.to_vec()],
|
||
},
|
||
node_cfg,
|
||
inference_codec_registry(),
|
||
|_| {},
|
||
)
|
||
.expect("failed to create cluster node")
|
||
}
|
||
|
||
fn pubkey_of(node: &ClusterNode) -> PublicKey {
|
||
PublicKey::from_bytes(&node.node_id().0).unwrap()
|
||
}
|
||
|
||
fn sees_alive(node: &ClusterNode, peer_key: &PublicKey) -> bool {
|
||
let peer = distribution::types::NodeId(*peer_key.as_bytes());
|
||
node.sees_alive(&peer)
|
||
}
|
||
|
||
/// Build a `num_stages + 1`-node cluster: index 0 is the orchestrator,
|
||
/// indices `1..=num_stages` are pipeline stages 0..num_stages-1. Every
|
||
/// non-orchestrator node joins via the orchestrator's seed address.
|
||
/// Returns once every node sees every other node alive, or panics on
|
||
/// timeout.
|
||
fn make_cluster(num_stages: u32) -> (Vec<ClusterNode>, MutexGuard<'static, ()>) {
|
||
let test_lock = acquire_cluster_lock();
|
||
|
||
assert!(num_stages >= 2, "cluster tests require num_stages >= 2");
|
||
let total = num_stages as usize + 1;
|
||
|
||
let mut nodes: Vec<ClusterNode> = (0..total)
|
||
.map(|_| {
|
||
if num_stages >= 8 {
|
||
make_node_with(large_cluster_node_config())
|
||
} else {
|
||
make_node()
|
||
}
|
||
})
|
||
.collect();
|
||
if num_stages >= 8 {
|
||
// All-to-all bootstrap for large clusters. A single seed relies on
|
||
// SWIM gossip to disseminate the full roster, but the gossip
|
||
// transmit budget (Λ·⌈log2 N⌉) is fixed and, under a serial pump's
|
||
// randomised piggybacking, does not reliably reach all ~13 nodes —
|
||
// it stalls at a partial roster. Seeding every node with every
|
||
// other node's endpoint makes each peer directly known and probed,
|
||
// so convergence is complete and stable. This still exercises the
|
||
// real iroh transport + SWIM membership across every node.
|
||
let addrs: Vec<_> = nodes.iter().map(|d| d.endpoint_addr()).collect();
|
||
for (i, d) in nodes.iter_mut().enumerate() {
|
||
let others: Vec<_> = addrs
|
||
.iter()
|
||
.enumerate()
|
||
.filter(|(j, _)| *j != i)
|
||
.map(|(_, a)| a.clone())
|
||
.collect();
|
||
d.join(&others);
|
||
}
|
||
} else {
|
||
let seed = nodes[0].endpoint_addr();
|
||
for d in nodes.iter_mut().skip(1) {
|
||
d.join(&[seed.clone()]);
|
||
}
|
||
}
|
||
|
||
let keys: Vec<PublicKey> = nodes.iter().map(pubkey_of).collect();
|
||
|
||
// Convergence finishes in well under 5s for small clusters, but a
|
||
// single-threaded pump fanning SWIM gossip across many nodes slows
|
||
// sharply as the node count climbs, so scale the cap with N.
|
||
let timeout = Duration::from_secs(30 + num_stages as u64 * 10);
|
||
let start = Instant::now();
|
||
let mut converged = false;
|
||
while start.elapsed() < timeout {
|
||
for n in nodes.iter_mut() {
|
||
n.pump_once();
|
||
}
|
||
let all_see_all = nodes.iter().enumerate().all(|(i, n)| {
|
||
keys.iter()
|
||
.enumerate()
|
||
.all(|(j, k)| i == j || sees_alive(n, k))
|
||
});
|
||
if all_see_all {
|
||
converged = true;
|
||
break;
|
||
}
|
||
std::thread::sleep(Duration::from_millis(20));
|
||
}
|
||
assert!(
|
||
converged,
|
||
"N={num_stages} cluster did not converge within {}s",
|
||
timeout.as_secs(),
|
||
);
|
||
(nodes, test_lock)
|
||
}
|
||
|
||
/// Stage index `s` (0-based) lives at node index `s + 1`; the
|
||
/// orchestrator is at node index 0.
|
||
fn stage_idx(s: u32) -> usize {
|
||
s as usize + 1
|
||
}
|
||
|
||
/// Send one `T` from `sender` to `receiver` over an iroh transport route,
|
||
/// drain the wire, and return the message the receiver inbox saw. Panics
|
||
/// if nothing arrived. Generic over any message type the inference codec
|
||
/// knows about.
|
||
fn send_and_receive<T: Message>(
|
||
sender: &ClusterNode,
|
||
receiver: &ClusterNode,
|
||
payload: T,
|
||
codecs: Arc<CodecRegistry>,
|
||
) -> T {
|
||
let mut rt_send = Runtime::new(RuntimeConfig::default());
|
||
let mut rt_recv = Runtime::new(RuntimeConfig::default());
|
||
|
||
let inbox = rt_recv.new_inbox::<T>().unwrap();
|
||
let inbox_addr: ActorAddress = *inbox.addr();
|
||
|
||
let transport = Arc::new(IrohActorTransport::new(
|
||
sender.driver.endpoint().clone(),
|
||
receiver.endpoint_addr(),
|
||
sender.driver.tokio_handle(),
|
||
));
|
||
let router = TransportRouter::new();
|
||
router.add_route(inbox_addr, transport);
|
||
rt_send.set_remote_sink(Arc::new(swactor_transport::CodecRemoteSink::new(
|
||
codecs.clone(),
|
||
Arc::new(router),
|
||
)));
|
||
// `rt_recv` only receives: it decodes incoming frames via `drain_actor_messages`
|
||
// (which takes `&codecs` directly), so it needs no remote sink of its own.
|
||
|
||
rt_send.send_to(inbox_addr, payload).unwrap();
|
||
std::thread::sleep(Duration::from_millis(200));
|
||
drain_actor_messages(
|
||
&receiver.driver,
|
||
&codecs,
|
||
&rt_recv,
|
||
Duration::from_millis(500),
|
||
);
|
||
inbox
|
||
.try_recv()
|
||
.expect("payload did not arrive at the receiver inbox")
|
||
}
|
||
|
||
fn shutdown_all(nodes: &mut [ClusterNode]) {
|
||
for n in nodes.iter_mut() {
|
||
n.driver.shutdown();
|
||
}
|
||
}
|
||
|
||
// ── §8 — cluster convergence at N ∈ {2, 3, 4} ───────────────────────────
|
||
|
||
fn convergence_case(num_stages: u32) {
|
||
let (mut nodes, _test_lock) = make_cluster(num_stages);
|
||
// orch + N stages → every node should see N alive peers.
|
||
for (i, n) in nodes.iter().enumerate() {
|
||
assert_eq!(
|
||
n.alive_count() as u32,
|
||
num_stages,
|
||
"node {i} should see {num_stages} alive peers after convergence at N={num_stages}",
|
||
);
|
||
}
|
||
shutdown_all(&mut nodes);
|
||
}
|
||
|
||
#[test]
|
||
fn n_node_cluster_converges_via_iroh_seed_join_n_2() {
|
||
convergence_case(2);
|
||
}
|
||
|
||
#[test]
|
||
fn n_node_cluster_converges_via_iroh_seed_join_n_3() {
|
||
convergence_case(3);
|
||
}
|
||
|
||
#[test]
|
||
fn n_node_cluster_converges_via_iroh_seed_join_n_4() {
|
||
convergence_case(4);
|
||
}
|
||
|
||
// ── comms-layer test: 12+ independent swactor nodes converge locally ──────
|
||
// Pure networking/SWIM: 12 stage nodes plus the orchestrator (13 nodes)
|
||
// all join via the seed and must each see every peer alive. No actors,
|
||
// no workers, no model — just the convergence contract at scale.
|
||
#[test]
|
||
fn n_node_cluster_converges_via_iroh_seed_join_n_12() {
|
||
convergence_case(12);
|
||
}
|
||
|
||
// ── §8 — StageActivation across every adjacent pair ──────────────────────
|
||
|
||
fn stage_activation_each_hop_case(num_stages: u32) {
|
||
let (mut nodes, _test_lock) = make_cluster(num_stages);
|
||
let codecs = Arc::new(inference_codec_registry());
|
||
|
||
for hop in 0..(num_stages - 1) {
|
||
let payload = StageActivation {
|
||
request_id: 100 + hop as u64,
|
||
position: hop * 4,
|
||
hidden: (0u8..(32 + hop as u8)).collect(),
|
||
seq_len: 4 + hop,
|
||
is_prefill: hop == 0,
|
||
};
|
||
|
||
let (sender_idx, receiver_idx) = (stage_idx(hop), stage_idx(hop + 1));
|
||
let (sender_part, receiver_part) = if sender_idx < receiver_idx {
|
||
let (left, right) = nodes.split_at_mut(receiver_idx);
|
||
(&left[sender_idx], &right[0])
|
||
} else {
|
||
unreachable!("hop sender_idx < receiver_idx by construction")
|
||
};
|
||
|
||
let received = send_and_receive::<StageActivation>(
|
||
sender_part,
|
||
receiver_part,
|
||
payload.clone(),
|
||
codecs.clone(),
|
||
);
|
||
assert_eq!(
|
||
received,
|
||
payload,
|
||
"StageActivation hop ({hop} -> {}) at N={num_stages} must roundtrip intact",
|
||
hop + 1,
|
||
);
|
||
}
|
||
|
||
shutdown_all(&mut nodes);
|
||
}
|
||
|
||
#[test]
|
||
fn stage_activation_roundtrips_between_each_adjacent_pair_n_2() {
|
||
stage_activation_each_hop_case(2);
|
||
}
|
||
|
||
#[test]
|
||
fn stage_activation_roundtrips_between_each_adjacent_pair_n_3() {
|
||
stage_activation_each_hop_case(3);
|
||
}
|
||
|
||
#[test]
|
||
fn stage_activation_roundtrips_between_each_adjacent_pair_n_4() {
|
||
stage_activation_each_hop_case(4);
|
||
}
|
||
|
||
// Comms layer carries StageActivation across all 11 forward hops of a
|
||
// converged 12-stage cluster — the message-passing half of the 12-node
|
||
// comms test.
|
||
#[test]
|
||
fn stage_activation_roundtrips_between_each_adjacent_pair_n_12() {
|
||
stage_activation_each_hop_case(12);
|
||
}
|
||
|
||
// ── §8 — NextToken from last stage to stage 0 ────────────────────────────
|
||
|
||
fn next_token_last_to_first_case(num_stages: u32) {
|
||
let (mut nodes, _test_lock) = make_cluster(num_stages);
|
||
let codecs = Arc::new(inference_codec_registry());
|
||
|
||
let payload = NextToken {
|
||
request_id: 42,
|
||
token_id: 1337,
|
||
position: 7,
|
||
done: false,
|
||
};
|
||
|
||
let last_idx = stage_idx(num_stages - 1);
|
||
let first_idx = stage_idx(0);
|
||
let (first_part, last_part) = {
|
||
let (left, right) = nodes.split_at_mut(last_idx);
|
||
(&left[first_idx], &right[0])
|
||
};
|
||
let received =
|
||
send_and_receive::<NextToken>(last_part, first_part, payload.clone(), codecs.clone());
|
||
assert_eq!(
|
||
received, payload,
|
||
"NextToken from last -> first at N={num_stages} must roundtrip intact",
|
||
);
|
||
|
||
shutdown_all(&mut nodes);
|
||
}
|
||
|
||
#[test]
|
||
fn next_token_roundtrips_last_to_first_n_2() {
|
||
next_token_last_to_first_case(2);
|
||
}
|
||
|
||
#[test]
|
||
fn next_token_roundtrips_last_to_first_n_3() {
|
||
next_token_last_to_first_case(3);
|
||
}
|
||
|
||
#[test]
|
||
fn next_token_roundtrips_last_to_first_n_4() {
|
||
next_token_last_to_first_case(4);
|
||
}
|
||
|
||
// ── §8 — InferenceResponse from last stage to orchestrator ───────────────
|
||
|
||
fn inference_response_last_to_orch_case(num_stages: u32) {
|
||
let (mut nodes, _test_lock) = make_cluster(num_stages);
|
||
let codecs = Arc::new(inference_codec_registry());
|
||
|
||
let payload = InferenceResponse {
|
||
text: format!("tokens: [N={num_stages}, OK, 世界]"),
|
||
};
|
||
|
||
let last_idx = stage_idx(num_stages - 1);
|
||
let (orch_part, last_part) = {
|
||
let (left, right) = nodes.split_at_mut(last_idx);
|
||
(&left[0], &right[0])
|
||
};
|
||
let received = send_and_receive::<InferenceResponse>(
|
||
last_part,
|
||
orch_part,
|
||
payload.clone(),
|
||
codecs.clone(),
|
||
);
|
||
assert_eq!(
|
||
received, payload,
|
||
"InferenceResponse from last -> orchestrator at N={num_stages} must roundtrip intact",
|
||
);
|
||
|
||
shutdown_all(&mut nodes);
|
||
}
|
||
|
||
#[test]
|
||
fn inference_response_roundtrips_last_to_orchestrator_n_2() {
|
||
inference_response_last_to_orch_case(2);
|
||
}
|
||
|
||
#[test]
|
||
fn inference_response_roundtrips_last_to_orchestrator_n_3() {
|
||
inference_response_last_to_orch_case(3);
|
||
}
|
||
|
||
#[test]
|
||
fn inference_response_roundtrips_last_to_orchestrator_n_4() {
|
||
inference_response_last_to_orch_case(4);
|
||
}
|
||
|
||
// ── §8 — SWIM death detection for each role ──────────────────────────────
|
||
|
||
/// Shut down the node at `victim_idx`, then pump the remaining nodes
|
||
/// until they all stop seeing the victim alive (or the timeout expires).
|
||
/// Returns whether detection succeeded.
|
||
fn wait_for_death(nodes: &mut [ClusterNode], victim_idx: usize, timeout: Duration) -> bool {
|
||
let victim_key = pubkey_of(&nodes[victim_idx]);
|
||
nodes[victim_idx].driver.shutdown();
|
||
|
||
let start = Instant::now();
|
||
while start.elapsed() < timeout {
|
||
for (i, n) in nodes.iter_mut().enumerate() {
|
||
if i != victim_idx {
|
||
n.pump_once();
|
||
}
|
||
}
|
||
let all_dropped = nodes
|
||
.iter()
|
||
.enumerate()
|
||
.all(|(i, n)| i == victim_idx || !sees_alive(n, &victim_key));
|
||
if all_dropped {
|
||
return true;
|
||
}
|
||
std::thread::sleep(Duration::from_millis(20));
|
||
}
|
||
false
|
||
}
|
||
|
||
/// Middle-stage death requires N >= 3 to even have a middle. We pick N=4
|
||
/// and kill stage 1 (one of the two middle stages).
|
||
#[test]
|
||
fn node_death_detected_via_swim_after_middle_stage_shutdown() {
|
||
let (mut nodes, _test_lock) = make_cluster(4);
|
||
let middle_idx = stage_idx(1);
|
||
let detected = wait_for_death(&mut nodes, middle_idx, Duration::from_secs(15));
|
||
assert!(
|
||
detected,
|
||
"every surviving node should detect the middle stage's death via SWIM within the suspicion window",
|
||
);
|
||
// Avoid double-shutdown: the victim is already shut down.
|
||
for (i, n) in nodes.iter_mut().enumerate() {
|
||
if i != middle_idx {
|
||
n.driver.shutdown();
|
||
}
|
||
}
|
||
}
|
||
|
||
/// First and last stage deaths are detected via SWIM the same way. We
|
||
/// run both at N=3 in one test — the per-iteration cost dominates, so
|
||
/// folding them in one test keeps the suite fast.
|
||
#[test]
|
||
fn node_death_detected_via_swim_after_first_or_last_stage_shutdown() {
|
||
// First-stage death scenario.
|
||
{
|
||
let (mut nodes, _test_lock) = make_cluster(3);
|
||
let first_idx = stage_idx(0);
|
||
let detected = wait_for_death(&mut nodes, first_idx, Duration::from_secs(15));
|
||
assert!(
|
||
detected,
|
||
"every surviving node should detect first stage's death via SWIM",
|
||
);
|
||
for (i, n) in nodes.iter_mut().enumerate() {
|
||
if i != first_idx {
|
||
n.driver.shutdown();
|
||
}
|
||
}
|
||
}
|
||
|
||
// Last-stage death scenario.
|
||
{
|
||
let (mut nodes, _test_lock) = make_cluster(3);
|
||
let last_idx = stage_idx(2);
|
||
let detected = wait_for_death(&mut nodes, last_idx, Duration::from_secs(15));
|
||
assert!(
|
||
detected,
|
||
"every surviving node should detect last stage's death via SWIM",
|
||
);
|
||
for (i, n) in nodes.iter_mut().enumerate() {
|
||
if i != last_idx {
|
||
n.driver.shutdown();
|
||
}
|
||
}
|
||
}
|
||
}
|