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

remove proxy from script start and modify config.hpp

parent 0a7463bd

include/config.hpp

+2 −2
Original line number Diff line number Diff line
@@ -111,14 +111,14 @@ constexpr auto fwd_remove = true; 
constexpr auto fwd_update_size = true;

constexpr auto fwd_io = true;

// Only use proxy for io if write/read size is higher than set value

constexpr auto fwd_io_count_threshold = 4000;

constexpr auto fwd_io_count_threshold = 1;



} // namespace proxy



namespace rpc {

constexpr auto chunksize = 524288; // in bytes (e.g., 524288 == 512KB)

// size of preallocated buffer to hold directory entries in rpc call

constexpr auto dirents_buff_size = (8 * 1024 * 1024); // 8 mega

constexpr auto dirents_buff_size = (128 * 1024 * 1024); // 8 mega

/*

 * Indicates the number of concurrent progress to drive I/O operations of chunk

 * files to and from local file systems The value is directly mapped to created

scripts/run/gkfs

+23 −23
Original line number Diff line number Diff line
@@ -174,35 +174,35 @@ start_daemon() { 
    echo -e "${C_AST_GREEN}GekkoFS daemons running"

    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) ..."

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

        ${proxy_execute} &

        local proxy_pid=$!

        sleep 5 # TODO

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

        elapsed="$(bc <<<"$stop_time-$start_time")"

        echo -e "${C_AST_GREEN}GekkoFS daemons probably :) running"

        echo -e "${C_AST_GREEN}Startup time: ${elapsed} seconds"

    fi

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

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

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

    #    ${proxy_execute} &

    #    local proxy_pid=$!

    #    sleep 5 # TODO

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

    #    elapsed="$(bc <<<"$stop_time-$start_time")"

    #    echo -e "${C_AST_GREEN}GekkoFS daemons probably :) running"

    #    echo -e "${C_AST_GREEN}Startup time: ${elapsed} seconds"

    #fi



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

        echo "Press 'q' to exit"

        while : ; do

            read -n 1 k <&1

            if [[ $k = q ]] ; then

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

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

                    echo

                    echo -e "${C_AST_GREEN}Shutting down GekkoFS proxies ..."

                    if [[ -n ${proxy_pid} ]]; then

                        kill -s SIGINT ${proxy_pid} &

                        wait ${proxy_pid}

                    fi

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

                    elapsed="$(bc <<<"$stop_time-$start_time")"

                    echo -e "${C_AST_GREEN}Shutdown time: ${elapsed} seconds"

                fi

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

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

                #    echo

                #    echo -e "${C_AST_GREEN}Shutting down GekkoFS proxies ..."

                #    if [[ -n ${proxy_pid} ]]; then

                #        kill -s SIGINT ${proxy_pid} &

                #        wait ${proxy_pid}

                #    fi

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

                #    elapsed="$(bc <<<"$stop_time-$start_time")"

                #    echo -e "${C_AST_GREEN}Shutdown time: ${elapsed} seconds"

                #fi

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

                echo

                echo -e "${C_AST_GREEN}Shutting down GekkoFS daemons ..."