Verified Commit 8e605f35 authored by Marc Vef's avatar Marc Vef
Browse files

WIP stash

parent 544483af

scripts/launcher.sh

+8 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ DAEMON_PATH="" 
GKFS_HOSTFILE_PATH=""

LISTEN=""

USE_MPI=false

USE_SRUN=false

NODES=""

NODENUM=1

MPI_HOSTS_ARGS=""
@@ -63,7 +64,7 @@ help_msg() { 


  usage_short

  echo "

This script starts and stops GekkoFS daemons on multiple nodes

This script starts and stops GekkoFS daemons on multiple nodes by using pdsh



positional arguments:

        command                   Command to interact with the script: {start, stop, restart, status}
@@ -76,7 +77,8 @@ optional arguments: 
        -p, --gkfs_daemon_path    Path to gkfs_deamon executable

        -H, --gkfs_hostfile       Path to where gkfs_daemons register their RPC endpoints (default: ./gkfs_hosts.txt)

        -l, --listen              Hostname suffix to listen on a specific network device (e.g., ib0 or eth0)

        --use_mpi                 Use orterun instead of srun to start the daemons

        --use_mpi                 Use orterun to start the daemons (EXPERIMENTAL)

        --use_srun                 Use srun to start the daemons (EXPERIMENTAL)

        -n, --nodes               Comma-separated list of nodes or a host file on where the daemons are/should run

        --pretend                 Doesn't execute commands, only prints what would be executed

        "
@@ -121,6 +123,10 @@ while [[ $# -gt 0 ]]; do 
    USE_MPI=true

    shift # past argument

    ;;

  --use_srun)

    USE_SRUN=true

    shift # past argument

    ;;

  -n | --nodes)

    NODES="$2"

    shift # past argument

src/daemon/util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void gkfs::util::destroy_hosts_file() { 
}



/**

 * Creates a pid file

 * Creates a pid file and checks that a daemon is not already running

 * @param rpc_self_addr

 */

void gkfs::util::create_pid_file() {