diff options
| -rw-r--r-- | config.toml | 4 | ||||
| -rw-r--r-- | src/config/endpoint_config.rs | 8 | ||||
| -rw-r--r-- | src/endpoint/configured.rs | 7 | ||||
| -rw-r--r-- | src/endpoint/scheduler.rs | 4 |
4 files changed, 13 insertions, 10 deletions
diff --git a/config.toml b/config.toml index 9536234..15843de 100644 --- a/config.toml +++ b/config.toml @@ -174,12 +174,14 @@ verify_images_present = true name = "testhostname" uri = "http://0.0.0.0:8095" # the URI of the endpoint. Either http or socket path endpoint_type = "http" # either "http" or "socket" -speed = 1 # currently ignored, but required to be present # maximum number of jobs running on this endpoint. # Set this to a reasonable high number to be able to run a lot of small jobs. # For example, if you're compiling with `make -j 1`, this should at least be the # number of CPU cores, maybe a bit more (eg. (ncpu * 1.1)) +# +# Also, if two nodes have the same number of running jobs, and a new job comes +# in, the node with more "free slots" will be considered first. maxjobs = 1 diff --git a/src/config/endpoint_config.rs b/src/config/endpoint_config.rs index 12a588a..13db137 100644 --- a/src/config/endpoint_config.rs +++ b/src/config/endpoint_config.rs @@ -26,14 +26,6 @@ pub struct Endpoint { #[getset(get = "pub")] endpoint_type: EndpointType, - /// Relative speed to other endpoints - /// - /// So if you have two servers, one with 12 cores and one with 24, you want to set "1" for the - /// first and "2" for the second (or "12" for the first and "24" for the second - the ratio is - /// the thing here)! - #[getset(get_copy = "pub")] - speed: usize, - /// Maximum number of jobs which are allowed on this endpoint #[getset(get_copy = "pub")] maxjobs: usize, diff --git a/src/endpoint/configured.rs b/src/endpoint/configured.rs index bbaaec6..ba1c54e 100644 --- a/src/endpoint/configured.rs +++ b/src/endpoint/configured.rs @@ -234,6 +234,13 @@ impl Endpoint { pub fn running_jobs(&self) -> usize { self.running_jobs.load(std::sync::atomic::Ordering::Relaxed) } + + /// Super non-scientific utilization calculation for the endpoint + pub fn utilization(&self) -> f64 { + let max_jobs = self.num_max_jobs() as f64; + let run_jobs = self.running_jobs() as f64; + 100.0 / max_jobs * run_jobs + } } pub struct EndpointHandle(Arc<Endpoint>); diff --git a/src/endpoint/scheduler.rs b/src/endpoint/scheduler.rs index 4f49034..34a79d7 100644 --- a/src/endpoint/scheduler.rs +++ b/src/endpoint/scheduler.rs @@ -110,7 +110,9 @@ impl EndpointScheduler { trace!("Endpoint {} considered for scheduling job: {}", ep.name(), r); r }) - .sorted_by(|ep1, ep2| ep1.running_jobs().cmp(&ep2.running_jobs())) + .sorted_by(|ep1, ep2| { + ep1.utilization().partial_cmp(&ep2.utilization()).unwrap_or(std::cmp::Ordering::Equal) + }) .next(); if let Some(endpoint) = ep { |