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

small fixes

parent 303262e4

src/daemon/daemon.cpp

+5 −5
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ parse_input(const cli_options& opts, const CLI::App& desc) { 
    // for now TODO)

    string proxy_addr{};

    string proxy_protocol{};

    if(desc.count("proxy-protocol")) {

    if(desc.count("--proxy-protocol")) {

        proxy_protocol = opts.proxy_protocol;

        if(proxy_protocol != gkfs::rpc::protocol::ofi_verbs &&

           proxy_protocol != gkfs::rpc::protocol::ofi_sockets &&
@@ -648,7 +648,7 @@ parse_input(const cli_options& opts, const CLI::App& desc) { 
                    "Given RPC protocol  for proxy '{}' not supported. Check --help for supported protocols.",

                    proxy_protocol));

        }

        if(desc.count("proxy-listen")) {

        if(desc.count("--proxy-listen")) {

            proxy_addr = opts.proxy_listen;

            // ofi+verbs requires an empty proxy_addr to bind to the ib

            // interface
@@ -682,7 +682,7 @@ parse_input(const cli_options& opts, const CLI::App& desc) { 
    }

    GKFS_DATA->hosts_file(hosts_file);



    assert(desc.count("mountdir"));

    assert(desc.count("--mountdir"));

    // Store mountdir and ensure parent dir exists as it is required for path

    // resolution on the client

    try {
@@ -948,10 +948,10 @@ main(int argc, const char* argv[]) { 
                "Defines the prometheus gateway <ip:port> (Default 127.0.0.1:9091).");

    #endif

    desc.add_option(

            "proxy-protocol,p", opts.proxy_protocol,

            "--proxy-protocol,-p", opts.proxy_protocol,

            "Starts an additional RPC server for proxy communication. Choose between: ofi+sockets, ofi+psm2, ofi+verbs. Default: Disabled");

    desc.add_option(

            "proxy-listen,L", opts.proxy_listen,

            "--proxy-listen,-L", opts.proxy_listen,

            "Address or interface to bind the proxy rpc server on (see listen above)");



    desc.add_flag("--version", "Print version and exit.");

src/proxy/proxy.cpp

+7 −7
Original line number Diff line number Diff line
@@ -319,11 +319,11 @@ main(int argc, const char* argv[]) { 
    CLI::App desc{"Allowed options"};

    cli_options opts{};

    // clang-format off

    desc.add_option("hosts-file,H", opts.hosts_file,

    desc.add_option("--hosts-file,-H", opts.hosts_file,

                    "Path to the shared host file generated by daemons, including all daemon addresses to connect to. (default path './gkfs_hosts.txt')");

    desc.add_option("proxy-protocol,p", opts.proxy_protocol,

    desc.add_option("--proxy-protocol,-p", opts.proxy_protocol,

                    "Used protocol between proxy and daemon communication. Choose between: ofi+sockets, ofi+psm2, ofi+verbs. Default: ofi+sockets");

    desc.add_option("pid-path,P", opts.pid_path,

    desc.add_option("--pid-path,-P", opts.pid_path,

                    "Path to PID file where daemon registers itself for clients. Default: /tmp/gkfs_proxy.pid");

    // clang-format on

    try {
@@ -336,14 +336,14 @@ main(int argc, const char* argv[]) { 
    PROXY_DATA->log(spdlog::get("main"));



    string proxy_protocol = gkfs::rpc::protocol::ofi_sockets;

    if(desc.count("proxy-protocol")) {

    if(desc.count("--proxy-protocol")) {

        proxy_protocol = opts.proxy_protocol;

    }

    string hosts_file = gkfs::config::hostfile_path;

    if(desc.count("hosts-file")) {

    if(desc.count("--hosts-file")) {

        hosts_file = opts.hosts_file;

    }

    if(desc.count("pid-path")) {

    if(desc.count("--pid-path")) {

        PROXY_DATA->pid_file_path(opts.pid_path);

    }