Option for disabling autodetection

spirali · spirali · commit 004888f00c2d · 2021-11-07T23:14:55.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/hyperqueue/Cargo.toml b/crates/hyperqueue/Cargo.toml
@@ -47,8 +47,8 @@ indicatif = "0.16.2"
 textwrap = "0.14"
 
 # Tako
-tako = { path = "../../../tako", default-features = false }
-# tako = { git = "https://github.com/spirali/tako", branch = "main", default-features = false }
+# tako = { path = "../../../tako", default-features = false }
+tako = { git = "https://github.com/spirali/tako", branch = "main", default-features = false }
 
 # Optional dependencies
 jemallocator = { version = "0.3.2", optional = true }
diff --git a/crates/hyperqueue/src/worker/start.rs b/crates/hyperqueue/src/worker/start.rs
@@ -85,6 +85,10 @@ pub struct WorkerStartOpts {
     #[clap(long, setting = clap::ArgSettings::MultipleOccurrences)]
     resource: Vec<String>,
 
+    #[clap(long = "no-detect-resources")]
+    /// Disable auto-detection of resources
+    no_detect_resources: bool,
+
     /// How often should the worker announce its existence to the server. (default: "8s")
     #[clap(long, default_value = "8s")]
     heartbeat: ArgDuration,
@@ -479,9 +483,15 @@ fn gather_configuration(opts: WorkerStartOpts) -> anyhow::Result<WorkerConfigura
         .map(|cpus| parse_cpu_definition(&cpus))
         .unwrap_or_else(detect_cpus)?;
 
-    let mut generic = detect_generic_resource()?;
+    let mut generic = if opts.no_detect_resources {
+        Vec::new()
+    } else {
+        detect_generic_resource()?
+    };
     for resource_def in opts.resource {
-        generic.push(parse_resource_definition(&resource_def)?)
+        let descriptor = parse_resource_definition(&resource_def)?;
+        generic.retain(|desc| desc.name != descriptor.name);
+        generic.push(descriptor)
     }
 
     let resources = ResourceDescriptor::new(cpus, generic);
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -164,6 +164,7 @@ def start_worker(
             self.server_dir,
             "worker",
             "start",
+            "--no-detect-resources",  # Ignore resources on testing machine
         ]
         hostname = f"worker{worker_id}"
         if set_hostname:

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ def start_worker(`
`164`	`164`	`self.server_dir,`
`165`	`165`	`"worker",`
`166`	`166`	`"start",`
	`167`	`+ "--no-detect-resources", # Ignore resources on testing machine`
`167`	`168`	`]`
`168`	`169`	`hostname = f"worker{worker_id}"`
`169`	`170`	`if set_hostname:`