Merge pull request #1 from jbordalo/main

Add support for differing username between cluster and local machine

2 files changed, 21 insertions, 2 deletions

diff --git a/src/context.rs b/src/context.rs
index f67c302..4c1b639 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -15,6 +15,7 @@ pub struct Context {
     job_id: Option<u32>,
     infer_job_id: bool,
     frontend_hostname: Option<String>,
+    cluster_username: Option<String>
 }
 
 impl Context {
@@ -22,12 +23,14 @@ impl Context {
         job_id: Option<u32>,
         infer_job_id: bool,
         frontend_hostname: Option<String>,
+        cluster_username: Option<String>
     ) -> Result<Self> {
         Ok(Self {
             node: get_execution_node().await?,
             job_id,
             infer_job_id,
             frontend_hostname,
+            cluster_username
         })
     }
 
@@ -57,6 +60,12 @@ impl Context {
             .as_deref()
             .ok_or_else(|| eyre::eyre!("missing frontend hostname"))
     }
+
+    pub fn cluster_username(&self) -> Result<&str> {
+        self.cluster_username
+            .as_deref()
+            .ok_or_else(|| eyre::eyre!("missing cluster username"))
+    }
 }
 
 async fn get_execution_node() -> Result<ExecutionNode> {
diff --git a/src/main.rs b/src/main.rs
index 972f1bb..64b2b1f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -57,6 +57,11 @@ struct Common {
     /// i.e. `ssh <frontend-hostname>` should work.
     #[clap(long, env = "FRONTEND_HOSTNAME")]
     frontend_hostname: Option<String>,
+
+    /// cluster username, needed if running locally with differing usernames
+    #[clap(long, env = "CLUSTER_USERNAME")]
+    cluster_username: Option<String>,
+
 }
 
 #[derive(Debug, Subcommand)]
@@ -240,12 +245,13 @@ async fn context_from_common(common: &Common) -> Result<Context> {
         common.job_id,
         common.infer_job_id,
         common.frontend_hostname.clone(),
+        common.cluster_username.clone()
     )
     .await?;
 
     if let ExecutionNode::Machine(_) = ctx.node {
         tracing::warn!(
-            "executing oar-p2p from a job machine is not currently support, run from the frontend or your own machine"
+            "executing oar-p2p from a job machine is not currently supported, run from the frontend or your own machine"
         );
     }
 
@@ -261,7 +267,7 @@ async fn cmd_net_up(args: NetUpArgs) -> Result<()> {
     );
     let matrix_content = tokio::fs::read_to_string(&args.latency_matrix)
         .await
-        .context("reading latecy matrix")?;
+        .context("reading latency matrix")?;
 
     tracing::debug!("parsing latency matrix");
     let matrix = LatencyMatrix::parse(&matrix_content, latency_matrix::TimeUnit::Milliseconds)
@@ -821,6 +827,10 @@ async fn machine_run(
             arguments.extend(ssh_common);
             arguments.push("-J");
             arguments.push(frontend);
+            if ctx.cluster_username().is_ok() {
+                    arguments.push("-l");
+                    arguments.push(ctx.cluster_username()?);
+                }
             arguments.push(machine.hostname());
             arguments
         }