chore(daemon) disable daemon workspace discovery (#6695)

Co-authored-by: Chris Olszewski <Chris Olszewski>

crates/turborepo-lib/src/run/mod.rs

@@ -13,7 +13,7 @@ use std::{
     collections::HashSet,
     io::{IsTerminal, Write},
     sync::Arc,
-    time::{Duration, SystemTime},
+    time::SystemTime,
 };
 
 pub use cache::{RunCache, TaskCache};
@@ -27,7 +27,7 @@ use turborepo_cache::{AsyncCache, RemoteCacheOpts};
 use turborepo_ci::Vendor;
 use turborepo_env::EnvironmentVariableMap;
 use turborepo_repository::{
-    discovery::{FallbackPackageDiscovery, LocalPackageDiscoveryBuilder, PackageDiscoveryBuilder},
+    discovery::{LocalPackageDiscoveryBuilder, PackageDiscoveryBuilder},
     package_graph::{PackageGraph, WorkspaceName},
     package_json::PackageJson,
 };
@@ -44,10 +44,7 @@ use crate::{
     engine::{Engine, EngineBuilder},
     opts::Opts,
     process::ProcessManager,
-    run::{
-        global_hash::get_global_hash_inputs, package_discovery::DaemonPackageDiscovery,
-        summary::RunTracker,
-    },
+    run::{global_hash::get_global_hash_inputs, summary::RunTracker},
     shim::TurboState,
     signal::{SignalHandler, SignalSubscriber},
     task_graph::Visitor,
@@ -195,7 +192,7 @@ impl<'a> Run<'a> {
 
         let is_ci_or_not_tty = turborepo_ci::is_ci() || !std::io::stdout().is_terminal();
 
-        let mut daemon = if is_ci_or_not_tty && !opts.run_opts.no_daemon {
+        let daemon = if is_ci_or_not_tty && !opts.run_opts.no_daemon {
             debug!("skipping turbod since we appear to be in a non-interactive context");
             None
         } else if !opts.run_opts.no_daemon {
@@ -224,18 +221,14 @@ impl<'a> Run<'a> {
         let mut pkg_dep_graph =
             PackageGraph::builder(&self.base.repo_root, root_package_json.clone())
                 .with_single_package_mode(opts.run_opts.single_package)
-                .with_package_discovery(FallbackPackageDiscovery::new(
-                    daemon.as_mut().map(DaemonPackageDiscovery::new),
-                    // TODO: we may never need this fallback, so we could make this a builder
-                    // instead and instantiate it lazily
+                .with_package_discovery(
                     LocalPackageDiscoveryBuilder::new(
                         self.base.repo_root.clone(),
                         None,
                         Some(root_package_json.clone()),
                     )
                     .build()?,
-                    Duration::from_millis(10),
-                ))
+                )
                 .build()
                 .await?;
 

crates/turborepo-repository/src/discovery.rs

@@ -10,6 +10,7 @@
 //! we can track areas of run that are performing sub-optimally.
 
 use tokio_stream::{iter, StreamExt};
+use tracing::debug;
 use turbopath::AbsoluteSystemPathBuf;
 
 use crate::{
@@ -190,14 +191,23 @@ impl<A: PackageDiscovery + Send, B: PackageDiscovery + Send> PackageDiscovery
 {
     async fn discover_packages(&mut self) -> Result<DiscoveryResponse, Error> {
         match tokio::time::timeout(self.timeout, self.primary.discover_packages()).await {
-            Ok(Ok(packages)) => Ok(packages),
-            Ok(Err(err1)) => match self.fallback.discover_packages().await {
-                Ok(packages) => Ok(packages),
-                // if the backup is unavailable, return the original error
-                Err(Error::Unavailable) => Err(err1),
-                Err(err2) => Err(err2),
-            },
-            Err(_) => self.fallback.discover_packages().await,
+            Ok(Ok(packages)) => {
+                debug!("used primary strategy");
+                Ok(packages)
+            }
+            Ok(Err(err1)) => {
+                debug!("primary strategy failed. using fallback strategy");
+                match self.fallback.discover_packages().await {
+                    Ok(packages) => Ok(packages),
+                    // if the backup is unavailable, return the original error
+                    Err(Error::Unavailable) => Err(err1),
+                    Err(err2) => Err(err2),
+                }
+            }
+            Err(_) => {
+                debug!("primary strategy timed out. using fallback strategy");
+                self.fallback.discover_packages().await
+            }
         }
     }
 }