fix(hydro_deploy): only instantiate Localhost once

Fixes #841
hydro-project · Aug 20, 2024 · db297a5 · db297a5
1 parent 5f2789a
commit db297a5
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 26 deletions.
diff --git a/docs/docs/hydroflow_plus/quickstart/clusters.mdx b/docs/docs/hydroflow_plus/quickstart/clusters.mdx
@@ -95,23 +95,22 @@ use hydroflow_plus_cli_integration::{DeployProcessSpec, DeployClusterSpec};
 #[tokio::main]
 async fn main() {
     let mut deployment = Deployment::new();
-    let localhost = deployment.Localhost();
     let profile = "dev";
 
     let builder = hydroflow_plus::FlowBuilder::new();
     let (leader, workers) = flow::broadcast::broadcast(&builder);
 
     flow.with_default_optimize()
         .with_process(&leader, DeployProcessSpec::new({
-            HydroflowCrate::new(".", localhost.clone())
+            HydroflowCrate::new(".", deployment.Localhost())
                 .bin("broadcast")
                 .profile(profile)
                 .display_name("leader")
         }))
         .with_cluster(&workers, DeployClusterSpec::new({
             (0..2)
                 .map(|idx| {
-                    HydroflowCrate::new(".", localhost.clone())
+                    HydroflowCrate::new(".", deployment.Localhost())
                         .bin("broadcast")
                         .profile(profile)
                         .display_name(format!("worker/{}", idx))

diff --git a/hydro_deploy/core/src/deployment.rs b/hydro_deploy/core/src/deployment.rs
@@ -13,24 +13,41 @@ use super::{
 };
 use crate::{AzureHost, ServiceBuilder};
 
-#[derive(Default)]
 pub struct Deployment {
     pub hosts: Vec<Weak<dyn Host>>,
     pub services: Vec<Weak<RwLock<dyn Service>>>,
     pub resource_pool: ResourcePool,
+    localhost_host: Option<Arc<LocalhostHost>>,
     last_resource_result: Option<Arc<ResourceResult>>,
     next_host_id: usize,
     next_service_id: usize,
 }
 
+impl Default for Deployment {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Deployment {
     pub fn new() -> Self {
-        Self::default()
+        let mut ret = Self {
+            hosts: Vec::new(),
+            services: Vec::new(),
+            resource_pool: ResourcePool::default(),
+            localhost_host: None,
+            last_resource_result: None,
+            next_host_id: 0,
+            next_service_id: 0,
+        };
+
+        ret.localhost_host = Some(ret.add_host(LocalhostHost::new));
+        ret
     }
 
     #[allow(non_snake_case)]
-    pub fn Localhost(&mut self) -> Arc<LocalhostHost> {
-        self.add_host(LocalhostHost::new)
+    pub fn Localhost(&self) -> Arc<LocalhostHost> {
+        self.localhost_host.clone().unwrap()
     }
 
     #[allow(non_snake_case)]

diff --git a/hydro_deploy/core/src/hydroflow_crate/mod.rs b/hydro_deploy/core/src/hydroflow_crate/mod.rs
@@ -143,10 +143,8 @@ mod tests {
     async fn test_crate_panic() {
         let mut deployment = deployment::Deployment::new();
 
-        let localhost = deployment.Localhost();
-
         let service = deployment.add_service(
-            HydroflowCrate::new("../hydro_cli_examples", localhost.clone())
+            HydroflowCrate::new("../hydro_cli_examples", deployment.Localhost())
                 .example("panic_program")
                 .profile("dev"),
         );

diff --git a/hydro_deploy/hydro_cli/src/lib.rs b/hydro_deploy/hydro_cli/src/lib.rs
@@ -155,13 +155,13 @@ impl Deployment {
     #[new]
     fn new() -> Self {
         Deployment {
-            underlying: Arc::new(RwLock::new(core::Deployment::default())),
+            underlying: Arc::new(RwLock::new(core::Deployment::new())),
         }
     }
 
     #[allow(non_snake_case)]
     fn Localhost(&self, py: Python<'_>) -> PyResult<Py<PyAny>> {
-        let arc = self.underlying.blocking_write().Localhost();
+        let arc = self.underlying.blocking_read().Localhost();
 
         Ok(Py::new(
             py,

diff --git a/hydroflow_plus_test/src/cluster/many_to_many.rs b/hydroflow_plus_test/src/cluster/many_to_many.rs
@@ -33,7 +33,6 @@ mod tests {
     #[tokio::test]
     async fn many_to_many() {
         let mut deployment = Deployment::new();
-        let localhost = deployment.Localhost();
 
         let builder = hydroflow_plus::FlowBuilder::new();
         let cluster = super::many_to_many(&builder);
@@ -47,7 +46,7 @@ mod tests {
                 DeployClusterSpec::new({
                     (0..2)
                         .map(|_| {
-                            HydroflowCrate::new(".", localhost.clone())
+                            HydroflowCrate::new(".", deployment.Localhost())
                                 .bin("many_to_many")
                                 .profile("dev")
                         })

diff --git a/hydroflow_plus_test/src/cluster/simple_cluster.rs b/hydroflow_plus_test/src/cluster/simple_cluster.rs
@@ -50,7 +50,6 @@ mod tests {
     #[tokio::test]
     async fn simple_cluster() {
         let mut deployment = Deployment::new();
-        let localhost = deployment.Localhost();
 
         let builder = hydroflow_plus::FlowBuilder::new();
         let (node, cluster) = super::simple_cluster(&builder);
@@ -62,7 +61,7 @@ mod tests {
             .with_process(
                 &node,
                 DeployProcessSpec::new({
-                    HydroflowCrate::new(".", localhost.clone())
+                    HydroflowCrate::new(".", deployment.Localhost())
                         .bin("simple_cluster")
                         .profile("dev")
                 }),
@@ -72,7 +71,7 @@ mod tests {
                 DeployClusterSpec::new({
                     (0..2)
                         .map(|_| {
-                            HydroflowCrate::new(".", localhost.clone())
+                            HydroflowCrate::new(".", deployment.Localhost())
                                 .bin("simple_cluster")
                                 .profile("dev")
                         })

diff --git a/hydroflow_plus_test/src/distributed/first_ten.rs b/hydroflow_plus_test/src/distributed/first_ten.rs
@@ -46,7 +46,6 @@ mod tests {
     #[tokio::test]
     async fn first_ten_distributed() {
         let mut deployment = Deployment::new();
-        let localhost = deployment.Localhost();
 
         let builder = hydroflow_plus::FlowBuilder::new();
         let (first_node, second_node) = super::first_ten_distributed(&builder);
@@ -60,15 +59,15 @@ mod tests {
             .with_process(
                 &first_node,
                 DeployProcessSpec::new({
-                    HydroflowCrate::new(".", localhost.clone())
+                    HydroflowCrate::new(".", deployment.Localhost())
                         .bin("first_ten_distributed")
                         .profile("dev")
                 }),
             )
             .with_process(
                 &second_node,
                 DeployProcessSpec::new({
-                    HydroflowCrate::new(".", localhost.clone())
+                    HydroflowCrate::new(".", deployment.Localhost())
                         .bin("first_ten_distributed")
                         .profile("dev")
                 }),

diff --git a/template/hydroflow_plus/flow/examples/first_ten_distributed.rs b/template/hydroflow_plus/flow/examples/first_ten_distributed.rs
@@ -4,7 +4,6 @@ use hydroflow_plus_cli_integration::DeployProcessSpec;
 #[tokio::main]
 async fn main() {
     let mut deployment = Deployment::new();
-    let localhost = deployment.Localhost();
 
     let flow = hydroflow_plus::FlowBuilder::new();
     let (p1, p2) = flow::first_ten_distributed::first_ten_distributed(&flow);
@@ -14,15 +13,15 @@ async fn main() {
         .with_process(
             &p1,
             DeployProcessSpec::new({
-                HydroflowCrate::new(".", localhost.clone())
+                HydroflowCrate::new(".", deployment.Localhost())
                     .bin("first_ten_distributed")
                     .profile("dev")
             }),
         )
         .with_process(
             &p2,
             DeployProcessSpec::new({
-                HydroflowCrate::new(".", localhost.clone())
+                HydroflowCrate::new(".", deployment.Localhost())
                     .bin("first_ten_distributed")
                     .profile("dev")
             }),

diff --git a/template/hydroflow_plus/flow/src/first_ten_distributed.rs b/template/hydroflow_plus/flow/src/first_ten_distributed.rs
@@ -41,7 +41,6 @@ mod tests {
     #[tokio::test]
     async fn first_ten_distributed() {
         let mut deployment = Deployment::new();
-        let localhost = deployment.Localhost();
 
         let flow = hydroflow_plus::FlowBuilder::new();
         let (p1, p2) = super::first_ten_distributed(&flow);
@@ -51,15 +50,15 @@ mod tests {
             .with_process(
                 &p1,
                 DeployProcessSpec::new({
-                    HydroflowCrate::new(".", localhost.clone())
+                    HydroflowCrate::new(".", deployment.Localhost())
                         .bin("first_ten_distributed")
                         .profile("dev")
                 }),
             )
             .with_process(
                 &p2,
                 DeployProcessSpec::new({
-                    HydroflowCrate::new(".", localhost.clone())
+                    HydroflowCrate::new(".", deployment.Localhost())
                         .bin("first_ten_distributed")
                         .profile("dev")
                 }),