Skip to content

Remove proxy #474

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 4 additions & 13 deletions controller/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,6 @@ mod tests {
use hyperactor::RefClient;
use hyperactor::channel;
use hyperactor::channel::ChannelTransport;
use hyperactor::channel::sim::SimAddr;
use hyperactor::clock::Clock;
use hyperactor::clock::RealClock;
use hyperactor::data::Named;
Expand Down Expand Up @@ -1559,20 +1558,13 @@ mod tests {
#[tokio::test]
async fn test_sim_supervision_failure() {
// Start system actor.
let system_addr = ChannelAddr::any(ChannelTransport::Unix);
let proxy_addr = ChannelAddr::any(ChannelTransport::Unix);
simnet::start(
ChannelAddr::any(ChannelTransport::Unix),
proxy_addr.clone(),
1000,
)
.unwrap();
simnet::start();
simnet::simnet_handle()
.unwrap()
.set_training_script_state(simnet::TrainingScriptState::Waiting);

let system_sim_addr =
ChannelAddr::Sim(SimAddr::new(system_addr, proxy_addr.clone()).unwrap());
ChannelAddr::any(ChannelTransport::Sim(Box::new(ChannelTransport::Unix)));
// Set very long supervision_update_timeout
let server_handle = System::serve(
system_sim_addr.clone(),
Expand All @@ -1588,9 +1580,8 @@ mod tests {
// Bootstrap the controller
let controller_id = id!(controller[0].root);
let proc_id = id!(world[0]);
let controller_proc_listen_addr = ChannelAddr::Sim(
SimAddr::new(ChannelAddr::any(ChannelTransport::Unix), proxy_addr).unwrap(),
);
let controller_proc_listen_addr =
ChannelAddr::any(ChannelTransport::Sim(Box::new(ChannelTransport::Unix)));

let (_, actor_ref) = ControllerActor::bootstrap(
controller_id.clone(),
Expand Down
11 changes: 5 additions & 6 deletions hyperactor/src/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ pub enum ChannelTransport {
Local,

/// Sim is a simulated channel for testing.
Sim(/*proxy address:*/ ChannelAddr),
Sim(/*simulated transport:*/ Box<ChannelTransport>),

/// Transport over unix domain socket.
Unix,
Expand Down Expand Up @@ -368,7 +368,7 @@ impl ChannelAddr {
Self::MetaTls(hostname, 0)
}
ChannelTransport::Local => Self::Local(0),
ChannelTransport::Sim(proxy) => sim::any(proxy),
ChannelTransport::Sim(transport) => sim::any(*transport),
// This works because the file will be deleted but we know we have a unique file by this point.
ChannelTransport::Unix => Self::Unix(net::unix::SocketAddr::from_str("").unwrap()),
}
Expand All @@ -380,7 +380,7 @@ impl ChannelAddr {
Self::Tcp(_) => ChannelTransport::Tcp,
Self::MetaTls(_, _) => ChannelTransport::MetaTls,
Self::Local(_) => ChannelTransport::Local,
Self::Sim(addr) => ChannelTransport::Sim(addr.proxy().clone()),
Self::Sim(addr) => ChannelTransport::Sim(Box::new(addr.transport())),
Self::Unix(_) => ChannelTransport::Unix,
}
}
Expand Down Expand Up @@ -637,10 +637,9 @@ mod tests {
}

for (raw, parsed) in cases_ok.iter().zip(src_ok.clone()).map(|(a, _)| {
let proxy_str = "unix!@proxy_a";
(
format!("sim!{},{}", a.0, &proxy_str),
ChannelAddr::Sim(SimAddr::new(a.1.clone(), proxy_str.parse().unwrap()).unwrap()),
format!("sim!{}", a.0),
ChannelAddr::Sim(SimAddr::new(a.1.clone()).unwrap()),
)
}) {
assert_eq!(raw.parse::<ChannelAddr>().unwrap(), parsed);
Expand Down
Loading
Loading