Merge branch 'master' into 'master'

Save jobid in variable by saving to file temporarily

See merge request sfux/VSCode_remote_HPC!5

cleanup.sh

+#!/bin/bash
+
+if [[ $# -lt 1 ]]
+then
+    echo -e "Error: No ETH username is specified, terminating script\n"
+    exit 1
+fi
+
+VSC_USERNAME=$1
+
+VSC_TUNNEL=$(cat reconnect_info | grep -o -E '[0-9]+:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+):[0-9]+')
+TUNNEL_JOBS=$(ps -u | grep $VSC_TUNNEL | grep ssh | awk '{ print $2 }')
+
+for TUNNEL_JOB in $TUNNEL_JOBS; do echo $TUNNEL_JOB; kill $TUNNEL_JOB; done
+
+ssh -T $VSC_USERNAME@euler.ethz.ch bkill $(cat reconnect_info  | grep BJOB | awk '{print $NF}') 

start_vscode.sh

@@ -297,14 +297,17 @@ ENDSSH
 
 # run the code-server job on Euler and save the ip of the compute node in the file vscip in the home directory of the user on Euler
 echo -e "Connecting to $VSC_HOSTNAME to start the code-server in a batch job"
-# FIXME: save jobid in a variable, that the script can kill the batch job at the end
-ssh $VSC_SSH_OPT bsub -n $VSC_NUM_CPU -W $VSC_RUN_TIME -R "rusage[mem=$VSC_MEM_PER_CPU_CORE]" $VSC_SNUM_GPU  <<ENDBSUB
+
+VSC_BJOB_OUT=$(ssh $VSC_SSH_OPT bsub -n $VSC_NUM_CPU -W $VSC_RUN_TIME -R "rusage[mem=$VSC_MEM_PER_CPU_CORE]" $VSC_SNUM_GPU<<ENDBSUB
 module load $VSC_MODULE_COMMAND
 export XDG_RUNTIME_DIR="\$HOME/vsc_runtime"
 VSC_IP_REMOTE="\$(hostname -i)"
 echo "Remote IP:\$VSC_IP_REMOTE" >> /cluster/home/$VSC_USERNAME/vscip
 code-server --bind-addr=\${VSC_IP_REMOTE}:8899
 ENDBSUB
+)
+
+VSC_BJOB_ID=$(echo $VSC_BJOB_OUT | awk '/is submitted/{print substr($2, 2, length($2)-2);}')
 
 # wait until batch job has started, poll every $VSC_WAITING_INTERVAL seconds to check if /cluster/home/$VSC_USERNAME/vscip exists
 # once the file exists and is not empty the batch job has started
@@ -354,6 +357,7 @@ Remote port       : $VSC_REMOTE_PORT
 Local port        : $VSC_LOCAL_PORT
 SSH tunnel        : ssh $VSC_SSH_OPT -L $VSC_LOCAL_PORT:$VSC_REMOTE_IP:$VSC_REMOTE_PORT -N &
 URL               : http://localhost:$VSC_LOCAL_PORT
+BJOB ID           : $VSC_BJOB_ID
 EOF
 
 # setup SSH tunnel from local computer to compute node via login node