Unverified Commit e3e545e2 authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

get rid of hostname-suffix

parent c7262480

include/client/preload_context.hpp

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ struct FsConfig { 
    std::map<std::string, std::string> endpoints;

    uint64_t host_id; // my host number

    size_t host_size;

    std::string hostname_suffix;

    unsigned int rpc_port;

    std::string lookup_file;

};

include/daemon/classes/fs_data.hpp

+0 −5
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ private: 
    uint64_t host_id_; // my host number

    size_t host_size_;

    unsigned int rpc_port_;

    std::string hostname_suffix_;

    std::string rpc_addr_;

    std::string lookup_file_;
@@ -137,10 +136,6 @@ public: 


    void host_size(size_t host_size);



    const std::string& hostname_suffix() const;



    void hostname_suffix(const std::string& suffix);



    unsigned int rpc_port() const;



    void rpc_port(unsigned int rpc_port);

include/global/rpc/rpc_types.hpp

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ MERCURY_GEN_PROC(rpc_config_out_t, ((hg_const_string_t) (mountdir)) 
((hg_const_string_t) (hosts_raw)) \

((hg_uint64_t) (host_id)) \

        ((hg_uint64_t) (host_size)) \

        ((hg_const_string_t) (hostname_suffix)) \

        ((hg_uint64_t) (rpc_port)) \

        ((hg_const_string_t) (lookup_file))

)

src/client/preload_util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ std::string get_uri_from_hostname(const std::string& hostname) { 
        return CTX->fs_conf()->endpoints.at(hostname);

    }



    auto host = get_host_by_name(hostname + CTX->fs_conf()->hostname_suffix);

    auto host = get_host_by_name(hostname);

    return fmt::format("{}://{}:{}", RPC_PROTOCOL, host, CTX->fs_conf()->rpc_port);

}

src/client/rpc/ld_rpc_management.cpp

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ bool get_fs_config() { 
    CTX->fs_conf()->gid = out.gid;

    CTX->fs_conf()->host_id = out.host_id;

    CTX->fs_conf()->host_size = out.host_size;

    CTX->fs_conf()->hostname_suffix = out.hostname_suffix;

    CTX->fs_conf()->lookup_file = out.lookup_file;

    CTX->fs_conf()->rpc_port = out.rpc_port;