Support multiple evaluators on a single machine

ofborg/src/bin/mass-rebuilder.rs

@@ -35,7 +35,8 @@ fn main() -> Result<(), Box<dyn Error>> {
     let conn = easylapin::from_config(&cfg.rabbitmq)?;
     let mut chan = task::block_on(conn.create_channel())?;
 
-    let cloner = checkout::cached_cloner(Path::new(&cfg.checkout.root));
+    let root = Path::new(&cfg.checkout.root);
+    let cloner = checkout::cached_cloner(&root.join(cfg.runner.instance.to_string()));
     let nix = cfg.nix();
 
     let events = stats::RabbitMq::from_lapin(&cfg.whoami(), task::block_on(conn.create_channel())?);

ofborg/src/clone.rs

@@ -147,6 +147,13 @@ pub trait GitClonable {
             .stdout(Stdio::null())
             .status()?;
 
+        debug!("git gc");
+        Command::new("git")
+            .arg("gc")
+            .current_dir(self.clone_to())
+            .stdout(Stdio::null())
+            .status()?;
+
         lock.unlock();
 
         Ok(())

ofborg/src/config.rs

@@ -64,8 +64,14 @@ pub struct LogStorage {
     pub path: String,
 }
 
+const fn default_instance() -> u8 {
+    1
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct RunnerConfig {
+    #[serde(default = "default_instance")]
+    pub instance: u8,
     pub identity: String,
     pub repos: Option<Vec<String>>,
     #[serde(default = "Default::default")]

ofborg/src/tasks/build.rs

@@ -92,6 +92,10 @@ impl<'a, 'b> JobActions<'a, 'b> {
         self.snippet_log.clone().into()
     }
 
+    pub fn pr_head_missing(&mut self) {
+        self.tell(worker::Action::Ack);
+    }
+
     pub fn commit_missing(&mut self) {
         self.tell(worker::Action::Ack);
     }
@@ -311,7 +315,12 @@ impl notifyworker::SimpleNotifyWorker for BuildWorker {
         };
 
         let refpath = co.checkout_origin_ref(target_branch.as_ref()).unwrap();
-        co.fetch_pr(job.pr.number).unwrap();
+
+        if co.fetch_pr(job.pr.number).is_err() {
+            info!("Failed to fetch {}", job.pr.number);
+            actions.pr_head_missing();
+            return;
+        }
 
         if !co.commit_exists(job.pr.head_sha.as_ref()) {
             info!("Commit {} doesn't exist", job.pr.head_sha);