Commit af9d2904 authored by Marc Vef's avatar Marc Vef
Browse files

Bugfix gkfs script

parent 31fe24ee

scripts/run/gkfs

+7 −6
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ start_daemon() { 
                echo -e "${C_AST_RED}ERROR: Daemon nodelist file not found at ${DAEMON_NODELIST_}. Exiting ..."

                exit 1

            fi

            ntasks=$(wc -l < "${DAEMON_NODELIST_}")

            srun_daemon_cmd="srun --disable-status --nodelist=${DAEMON_NODELIST_} --ntasks=${ntasks} --cpus-per-task=${CPUS_PER_TASK} ${SRUN_ARGS} "

            NODE_NUM=$(wc -l < "${DAEMON_NODELIST_}")

            srun_daemon_cmd="srun --disable-status --nodelist=${DAEMON_NODELIST_} --ntasks=${NODE_NUM} --cpus-per-task=${CPUS_PER_TASK} ${SRUN_ARGS} "

        else

            node_list=$(scontrol show job "${SLURM_JOB_ID}" | grep " NodeList=" | cut -d "=" -f2)

            if [[ -z ${NODE_NUM} ]]; then
@@ -132,10 +132,11 @@ start_daemon() { 
                    echo -e "${C_AST_RED}ERROR: Proxy nodelist file not found at ${PROXY_NODELIST_}. Exiting ..."

                    exit 1

                fi

                ntasks=$(wc -l < "${PROXY_NODELIST_}")

                srun_proxy_cmd="srun --disable-status --nodelist=${PROXY_NODELIST_} --ntasks=${ntasks} --cpus-per-task=${CPUS_PER_TASK} ${SRUN_ARGS} "

                NODE_NUM_PROXY=$(wc -l < "${PROXY_NODELIST_}")

                srun_proxy_cmd="srun --disable-status --nodelist=${PROXY_NODELIST_} --ntasks=${NODE_NUM_PROXY} --cpus-per-task=${CPUS_PER_TASK} ${SRUN_ARGS} "

            else

                srun_proxy_cmd="srun --disable-status -N ${NODE_NUM} --ntasks=${NODE_NUM} --cpus-per-task=${CPUS_PER_TASK} ${SRUN_ARGS} "

                NODE_NUM_PROXY=$NODE_NUM

            fi

        fi

    else
@@ -174,7 +175,7 @@ start_daemon() { 
            proxy_cmd="${PROXY_AFFINITY_} ${proxy_cmd}"

        fi

        # final proxy execute command

        proxy_execute="${srun_daemon_cmd} ${SRUN_PROXY_ARGS} ${proxy_cmd}"

        proxy_execute="${srun_proxy_cmd} ${SRUN_PROXY_ARGS} ${proxy_cmd}"

    fi



    if [[ ${VERBOSE} == true ]]; then
@@ -200,7 +201,7 @@ start_daemon() { 
    echo -e "${C_AST_GREEN}Startup time: ${elapsed} seconds"



    if [[ ${USE_PROXY} == true ]]; then

        echo -e "${C_AST_GREEN}Starting GekkoFS proxies (${NODE_NUM} nodes) ..."

        echo -e "${C_AST_GREEN}Starting GekkoFS proxies (${NODE_NUM_PROXY} nodes) ..."

        start_time="$(date -u +%s.%3N)"

        ${proxy_execute} &

        local proxy_pid=$!