Verified Commit c3216c0f authored by Marc Vef's avatar Marc Vef
Browse files

Migrate Proxy to Margo-hg-shim

parent 08db0000

include/client/rpc/rpc_types.hpp

+16 −16
Original line number Diff line number Diff line
@@ -2314,10 +2314,10 @@ struct write_data_proxy { 
    // RPC public identifier

    // (N.B: we reuse the same IDs assigned by Margo so that the daemon

    // understands Hermes RPCs)

    constexpr static const uint64_t public_id = 3263823872;

    constexpr static const uint64_t public_id = 20;



    // RPC internal Mercury identifier

    constexpr static const hg_id_t mercury_id = public_id;

    constexpr static const hg_id_t mercury_id = 0;



    // RPC name

    constexpr static const auto name = gkfs::rpc::tag::client_proxy_write;
@@ -2454,10 +2454,10 @@ struct read_data_proxy { 
    // RPC public identifier

    // (N.B: we reuse the same IDs assigned by Margo so that the daemon

    // understands Hermes RPCs)

    constexpr static const uint64_t public_id = 2643656704;

    constexpr static const uint64_t public_id = 21;



    // RPC internal Mercury identifier

    constexpr static const hg_id_t mercury_id = public_id;

    constexpr static const hg_id_t mercury_id = 0;



    // RPC name

    constexpr static const auto name = gkfs::rpc::tag::client_proxy_read;
@@ -2594,10 +2594,10 @@ struct chunk_stat_proxy { 
    // RPC public identifier

    // (N.B: we reuse the same IDs assigned by Margo so that the daemon

    // understands Hermes RPCs)

    constexpr static const uint64_t public_id = 2330722304;

    constexpr static const uint64_t public_id = 22;



    // RPC internal Mercury identifier

    constexpr static const hg_id_t mercury_id = public_id;

    constexpr static const hg_id_t mercury_id = 0;



    // RPC name

    constexpr static const auto name = gkfs::rpc::tag::client_proxy_chunk_stat;
@@ -2728,10 +2728,10 @@ struct create_proxy { 
    // RPC public identifier

    // (N.B: we reuse the same IDs assigned by Margo so that the daemon

    // understands Hermes RPCs)

    constexpr static const uint64_t public_id = 3054698496;

    constexpr static const uint64_t public_id = 23;



    // RPC internal Mercury identifier

    constexpr static const hg_id_t mercury_id = public_id;

    constexpr static const hg_id_t mercury_id = 0;



    // RPC name

    constexpr static const auto name = gkfs::rpc::tag::client_proxy_create;
@@ -2845,10 +2845,10 @@ struct stat_proxy { 
    // RPC public identifier

    // (N.B: we reuse the same IDs assigned by Margo so that the daemon

    // understands Hermes RPCs)

    constexpr static const uint64_t public_id = 2552037376;

    constexpr static const uint64_t public_id = 24;



    // RPC internal Mercury identifier

    constexpr static const hg_id_t mercury_id = public_id;

    constexpr static const hg_id_t mercury_id = 0;



    // RPC name

    constexpr static const auto name = gkfs::rpc::tag::client_proxy_stat;
@@ -2965,10 +2965,10 @@ struct remove_proxy { 
    // RPC public identifier

    // (N.B: we reuse the same IDs assigned by Margo so that the daemon

    // understands Hermes RPCs)

    constexpr static const uint64_t public_id = 2616000512;

    constexpr static const uint64_t public_id = 25;



    // RPC internal Mercury identifier

    constexpr static const hg_id_t mercury_id = public_id;

    constexpr static const hg_id_t mercury_id = 0;



    // RPC name

    constexpr static const auto name = gkfs::rpc::tag::client_proxy_remove;
@@ -3074,10 +3074,10 @@ struct update_metadentry_size_proxy { 
    // RPC public identifier

    // (N.B: we reuse the same IDs assigned by Margo so that the daemon

    // understands Hermes RPCs)

    constexpr static const uint64_t public_id = 3725459456;

    constexpr static const uint64_t public_id = 26;



    // RPC internal Mercury identifier

    constexpr static const hg_id_t mercury_id = public_id;

    constexpr static const hg_id_t mercury_id = 0;



    // RPC name

    constexpr static const auto name = gkfs::rpc::tag::client_proxy_update_size;
@@ -3213,10 +3213,10 @@ struct get_dirents_extended_proxy { 
    // RPC public identifier

    // (N.B: we reuse the same IDs assigned by Margo so that the daemon

    // understands Hermes RPCs)

    constexpr static const uint64_t public_id = 3686662144;

    constexpr static const uint64_t public_id = 27;



    // RPC internal Mercury identifier

    constexpr static const hg_id_t mercury_id = public_id;

    constexpr static const hg_id_t mercury_id = 0;



    // RPC name

    constexpr static const auto name =

src/daemon/handler/srv_data.cpp

+2 −2
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ rpc_srv_proxy_write(hg_handle_t handle) { 
        return gkfs::rpc::cleanup_respond(&handle, &in, &out, &bulk_handle);

    }

    auto hgi = margo_get_info(handle);

    auto mid = margo_hg_info_get_instance(hgi);

    auto mid = margo_hg_handle_get_instance(handle);

    auto bulk_size = margo_bulk_get_size(in.bulk_handle);

    GKFS_DATA->spdlogger()->debug(

            "{}() path: '{}' chunk_start '{}' chunk_end '{}' chunk_n '{}' total_chunk_size '{}' bulk_size: '{}' offset: '{}'",
@@ -989,7 +989,7 @@ rpc_srv_proxy_read(hg_handle_t handle) { 
        return gkfs::rpc::cleanup_respond(&handle, &in, &out, &bulk_handle);

    }

    auto hgi = margo_get_info(handle);

    auto mid = margo_hg_info_get_instance(hgi);

    auto mid = margo_hg_handle_get_instance(handle);

    auto bulk_size = margo_bulk_get_size(in.bulk_handle);



    GKFS_DATA->spdlogger()->debug(

src/proxy/rpc/forward_metadata.cpp

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ forward_get_dirents_single(const std::string& path, int server, void* buf, 
    if(ret != HG_SUCCESS) {

        PROXY_DATA->log()->error(

                "{}() Unable to send non-blocking rpc for path {} and recipient {}",

                __func__, path, target);

                __func__, path, server);

        margo_destroy(rpc_handle);

        margo_bulk_free(bulk_handle);

        return ::make_pair(EBUSY, 0);

src/proxy/rpc/srv_data.cpp

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ proxy_rpc_srv_write(hg_handle_t handle) { 
    }



    auto hgi = margo_get_info(handle);

    auto mid = margo_hg_info_get_instance(hgi);

    auto mid = margo_hg_handle_get_instance(handle);

    auto bulk_size = margo_bulk_get_size(client_in.bulk_handle);

    assert(bulk_size == client_in.write_size);

    PROXY_DATA->log()->debug(
@@ -116,7 +116,7 @@ proxy_rpc_srv_read(hg_handle_t handle) { 
    }



    auto hgi = margo_get_info(handle);

    auto mid = margo_hg_info_get_instance(hgi);

    auto mid = margo_hg_handle_get_instance(handle);

    auto bulk_size = margo_bulk_get_size(client_in.bulk_handle);

    assert(bulk_size == client_in.read_size);

    PROXY_DATA->log()->debug(

src/proxy/rpc/srv_metadata.cpp

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ proxy_rpc_srv_get_dirents_extended(hg_handle_t handle) { 
                             client_in.path, client_in.server);



    auto hgi = margo_get_info(handle);

    auto mid = margo_hg_info_get_instance(hgi);

    auto mid = margo_hg_handle_get_instance(handle);

    auto bulk_size = margo_bulk_get_size(client_in.bulk_handle);

    PROXY_DATA->log()->debug("{}() Got RPC with path '{}' bulk_size '{}'",

                             __func__, client_in.path, bulk_size);