Replace stdout-parsed runtime-ready detection with an explicit, plugin-driven bootstrap-completion step and actorize SSH bootstrap teardown.
- provisioning: drop the `PluginObservation::RuntimeReady` variant and add `ProvisionPlugin::complete_bootstrap`, an explicit per-node completion hook (no-op for `LocalDockerPlugin`)
- bootstrap_datastream: remove `parse_runtime_ready`/`RuntimeReadyLine` so bootstrap no longer infers readiness from a parsed stdout JSON line
- vastai_provisioning: drop the `ReadyTrackingSink` ready-flag wrapper; the SSH retry loop now runs purely `while !stopping`, and `complete_bootstrap` stops the node's bootstrap with `BootstrapStopReason::RuntimeReady`
- vastai_provisioning: actorize teardown as `SshBootstrapActor` on the swactor `Runtime` (handle holds an `ActorAddress`), with `stop_bootstrap(handle, reason)` delivering a `Stop` message; add `BootstrapStopReason::{RuntimeReady,NodeStop}`
- actors/provisioner: replace the `RuntimeReady` observation arm with a `ProvisionerMsg::RuntimeReady` handler that calls `complete_bootstrap` then `mark_live`/emits NodeLive (or NodeFailed on error)
- callers/tests: wire the new explicit ready flow through node_agent, the orchestrator/worker_node binaries, and `mvp_one_node_chat`; add the `ssh_bootstrap_actor_stop_kills_child` test
Signed-off-by: Zachery Aaron Shores-Chmielewski <zacheryasc@gmail.com>
183 lines
5.3 KiB
Rust
183 lines
5.3 KiB
Rust
use std::io::{BufRead, BufReader, Read};
|
|
use std::thread::{self, JoinHandle};
|
|
|
|
use datastream::{ChannelId, DatastreamProducer, Lifetime, NodeId, StreamId};
|
|
use serde::{Deserialize, Serialize};
|
|
use serde_json::Value;
|
|
|
|
use crate::provisioning::{
|
|
NodeProvisionSpec, PluginObservation, PluginSink, ProvisionLogLine, ProvisionLogStream,
|
|
};
|
|
use crate::telemetry::{MvpProvisionLogRecord, mvp_provision_log_channel};
|
|
|
|
pub fn node_datastream_id(node_id: u64) -> String {
|
|
node_id.to_string()
|
|
}
|
|
|
|
pub fn node_stream_id(run_id: u64, node_id: u64) -> StreamId {
|
|
StreamId::new(NodeId::new(&node_datastream_id(node_id)), Lifetime(run_id))
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct BootstrapDatastreamBridge {
|
|
spec: NodeProvisionSpec,
|
|
sink: PluginSink,
|
|
producer: Option<DatastreamProducer>,
|
|
}
|
|
|
|
impl BootstrapDatastreamBridge {
|
|
pub fn new(
|
|
spec: NodeProvisionSpec,
|
|
sink: PluginSink,
|
|
producer: Option<DatastreamProducer>,
|
|
) -> Self {
|
|
Self {
|
|
spec,
|
|
sink,
|
|
producer,
|
|
}
|
|
}
|
|
|
|
pub fn spec(&self) -> &NodeProvisionSpec {
|
|
&self.spec
|
|
}
|
|
|
|
pub fn stream_id(&self) -> StreamId {
|
|
node_stream_id(self.spec.run_id, self.spec.node_id)
|
|
}
|
|
|
|
pub fn observe_stdout_line(&self, line: impl Into<String>) {
|
|
let line = line.into();
|
|
if let Some(frame) = parse_stdio_datastream_frame(&self.spec, &line) {
|
|
self.sink.observe(frame);
|
|
return;
|
|
}
|
|
self.submit_log(ProvisionLogStream::Stdout, &line);
|
|
self.sink.observe(PluginObservation::StdoutLine {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
line: line.clone(),
|
|
});
|
|
}
|
|
|
|
pub fn observe_stderr_line(&self, line: impl Into<String>) {
|
|
let line = line.into();
|
|
self.submit_log(ProvisionLogStream::Stderr, &line);
|
|
self.sink.observe(PluginObservation::StderrLine {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
line,
|
|
});
|
|
}
|
|
|
|
pub fn observe_provider_line(&self, line: impl Into<String>) {
|
|
let line = line.into();
|
|
self.submit_log(ProvisionLogStream::Provider, &line);
|
|
self.sink.observe(PluginObservation::ProviderLine {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
line,
|
|
});
|
|
}
|
|
|
|
pub fn spawn_stdout_reader<R>(&self, stdout: R) -> JoinHandle<()>
|
|
where
|
|
R: Read + Send + 'static,
|
|
{
|
|
let bridge = self.clone();
|
|
thread::spawn(move || bridge.read_stdout(stdout))
|
|
}
|
|
|
|
pub fn spawn_stderr_reader<R>(&self, stderr: R) -> JoinHandle<()>
|
|
where
|
|
R: Read + Send + 'static,
|
|
{
|
|
let bridge = self.clone();
|
|
thread::spawn(move || bridge.read_stderr(stderr))
|
|
}
|
|
|
|
fn read_stdout<R>(&self, stdout: R)
|
|
where
|
|
R: Read,
|
|
{
|
|
let reader = BufReader::new(stdout);
|
|
for next in reader.lines() {
|
|
match next {
|
|
Ok(line) => self.observe_stdout_line(line),
|
|
Err(error) => {
|
|
self.sink.observe(PluginObservation::Failed {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
reason: format!("read stdout: {error}"),
|
|
});
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn read_stderr<R>(&self, stderr: R)
|
|
where
|
|
R: Read,
|
|
{
|
|
let reader = BufReader::new(stderr);
|
|
for next in reader.lines() {
|
|
match next {
|
|
Ok(line) => self.observe_stderr_line(line),
|
|
Err(error) => {
|
|
self.sink.observe(PluginObservation::Failed {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
reason: format!("read stderr: {error}"),
|
|
});
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn submit_log(&self, stream: ProvisionLogStream, line: &str) {
|
|
let Some(producer) = &self.producer else {
|
|
return;
|
|
};
|
|
let record = MvpProvisionLogRecord::new(ProvisionLogLine {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
stream,
|
|
line: line.to_owned(),
|
|
});
|
|
let payload = serde_json::to_vec(&record).expect("serialize bootstrap log record");
|
|
producer.submit_bytes(
|
|
mvp_provision_log_channel(self.spec.node_id, stream),
|
|
payload,
|
|
);
|
|
}
|
|
}
|
|
|
|
#[derive(Deserialize, Serialize)]
|
|
struct StdioDatastreamFrame {
|
|
mvp_stdio_event: u32,
|
|
kind: String,
|
|
channel: String,
|
|
payload: Value,
|
|
}
|
|
|
|
pub fn parse_stdio_datastream_frame(
|
|
spec: &NodeProvisionSpec,
|
|
line: &str,
|
|
) -> Option<PluginObservation> {
|
|
let frame = serde_json::from_str::<StdioDatastreamFrame>(line).ok()?;
|
|
if frame.mvp_stdio_event != 1 || frame.kind != "datastream_frame" {
|
|
return None;
|
|
}
|
|
Some(PluginObservation::DatastreamFrame {
|
|
run_id: spec.run_id,
|
|
node_id: spec.node_id,
|
|
channel: frame.channel,
|
|
payload: frame.payload.to_string(),
|
|
})
|
|
}
|
|
|
|
pub fn bootstrap_log_channel(node_id: u64, stream: ProvisionLogStream) -> ChannelId {
|
|
mvp_provision_log_channel(node_id, stream)
|
|
}
|