Agent compiling

src/bin/agent/config.rs

@@ -51,7 +51,7 @@ pub struct GlobalConfig {
     pub ip: String,
     pub port: u32,
     pub resources: TaskResources,
-    pub tracker: mpsc::UnboundedSender<TrackerMessage>,
+    pub storage: mpsc::UnboundedSender<StorageMessage>,
     pub executor: mpsc::UnboundedSender<ExecutorMessage>,
 }
 
@@ -66,14 +66,14 @@ impl GlobalConfig {
         local_executor::start(*workers as usize, exe_rx);
 
         // Tracker
-        let (tracker, trx) = mpsc::unbounded_channel();
+        let (storage, trx) = mpsc::unbounded_channel();
-        noop_tracker::start(trx);
+        waterfall::storage::noop::start(trx);
 
         GlobalConfig {
             ip: spec.ip.clone(),
             port: spec.port,
             resources: spec.resources.clone(),
-            tracker,
+            storage,
             executor,
         }
     }

src/bin/agent/main.rs

@@ -27,16 +27,16 @@ async fn submit_task(
 ) -> impl Responder {
     let (response, rx) = oneshot::channel();
 
-    let submission = data.into_inner();
+    let submission = details.into_inner();
-
-    let trx = data.tracker.clone();
 
+    let (_, kill) = oneshot::channel();
     data.executor
         .send(ExecutorMessage::ExecuteTask {
             details: submission.details,
             output_options: submission.output_options,
             varmap: submission.varmap,
             response,
+            kill,
         })
         .unwrap();
 

src/executors/agent_executor.rs

@@ -105,9 +105,9 @@ fn validate_task(details: &TaskDetails, max_capacities: &[TaskResources]) -> Res
 /// Contains specifics on how to run a local task
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct TaskSubmission {
-    details: TaskDetails,
+    pub details: TaskDetails,
-    varmap: VarMap,
+    pub varmap: VarMap,
-    output_options: TaskOutputOptions,
+    pub output_options: TaskOutputOptions,
 }
 
 async fn submit_task(