Commit fc07bd6a authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch... 

Merge branch 'amiranda/101-refactor-library-rpc-implementation-of-admire-update_pfs_storage' into 'main'

Resolve "Refactor library RPC implementation of `admire::update_pfs_storage`"

Closes #101

See merge request !70
parents df51b8d1 37d11500

examples/c/ADM_update_pfs_storage.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ main(int argc, char* argv[]) { 
    }



    // We can now request the update to the server

    if((ret = ADM_update_pfs_storage(server, new_pfs_ctx, pfs_storage)) !=

    if((ret = ADM_update_pfs_storage(server, pfs_storage, new_pfs_ctx)) !=

       ADM_SUCCESS) {

        fprintf(stderr, "ADM_update_pfs_storage() failed: %s\n",

                ADM_strerror(ret));

examples/cxx/ADM_update_pfs_storage.cpp

+13 −12
Original line number Diff line number Diff line
@@ -37,25 +37,26 @@ main(int argc, char* argv[]) { 


    admire::server server{"tcp", argv[1]};



    ADM_pfs_context_t ctx{};

    ADM_pfs_storage_t pfs_storage{};

    ADM_return_t ret = ADM_SUCCESS;

    std::string pfs_name = "gpfs_scratch";

    std::string pfs_mount = "/gpfs/scratch";

    std::string new_pfs_mount = "/gpfs/scratch2";



    try {

        ret = admire::update_pfs_storage(server, ctx, pfs_storage);



        const auto pfs_storage = admire::register_pfs_storage(

                server, pfs_name, admire::pfs_storage::type::gpfs,

                admire::pfs_storage::ctx{pfs_mount});



        admire::update_pfs_storage(server, pfs_storage,

                                   admire::pfs_storage::ctx{new_pfs_mount});

    } catch(const std::exception& e) {

        fmt::print(stderr, "FATAL: ADM_update_pfs_storage() failed: {}\n",

        fmt::print(stderr,

                   "FATAL: ADM_update_pfs_storage() or "

                   "ADM_update_pfs_storage() failed: {}\n",

                   e.what());

        exit(EXIT_FAILURE);

    }



    if(ret != ADM_SUCCESS) {

        fmt::print(stdout,

                   "ADM_update_pfs_storage() remote procedure not completed "

                   "successfully\n");

        exit(EXIT_FAILURE);

    }



    fmt::print(stdout, "ADM_update_pfs_storage() remote procedure completed "

                       "successfully\n");

}

src/common/net/proto/rpc_types.h

+10 −2
Original line number Diff line number Diff line
@@ -403,9 +403,17 @@ MERCURY_GEN_PROC( 
);



/// ADM_update_pfs_storage

MERCURY_GEN_PROC(ADM_update_pfs_storage_in_t, ((int32_t) (reqs)))

MERCURY_GEN_PROC(

    ADM_update_pfs_storage_in_t,

        ((ADM_pfs_context_t) (pfs_storage_ctx))

        ((hg_uint64_t)       (server_id))

);



MERCURY_GEN_PROC(ADM_update_pfs_storage_out_t, ((int32_t) (ret)))

MERCURY_GEN_PROC(

    ADM_update_pfs_storage_out_t,

        ((hg_uint64_t) (op_id))

        ((hg_int32_t)  (retval))

);



/// ADM_remove_pfs_storage

MERCURY_GEN_PROC(ADM_remove_pfs_storage_in_t, ((int32_t) (reqs)))

src/lib/admire.cpp

+9 −22
Original line number Diff line number Diff line
@@ -308,31 +308,18 @@ register_pfs_storage(const server& srv, const std::string& name, 
    return rv.value();

}



ADM_return_t

update_pfs_storage(const server& srv, ADM_pfs_context_t ctx,

                   ADM_pfs_storage_t pfs_storage) {

    (void) srv;

    (void) ctx;

    (void) pfs_storage;



    scord::network::rpc_client rpc_client{srv.protocol(), rpc_registration_cb};



    auto endp = rpc_client.lookup(srv.address());



    LOGGER_INFO("ADM_update_pfs_storage(...)");



    ADM_update_pfs_storage_in_t in{};

    ADM_update_pfs_storage_out_t out;

void

update_pfs_storage(const server& srv, const pfs_storage& pfs_storage,

                   const admire::pfs_storage::ctx& pfs_storage_ctx) {



    const auto rpc = endp.call("ADM_update_pfs_storage", &in, &out);

    const auto ec =

            detail::update_pfs_storage(srv, pfs_storage, pfs_storage_ctx);



    if(out.ret < 0) {

        LOGGER_ERROR("ADM_update_pfs_storage() = {}", out.ret);

        return static_cast<ADM_return_t>(out.ret);

    if(!ec) {

        throw std::runtime_error(fmt::format(

                "ADM_update_pfs_storage() error: {}", ec.message()));

    }



    LOGGER_INFO("ADM_update_pfs_storage() = {}", ADM_SUCCESS);

    return ADM_SUCCESS;

}



ADM_return_t

src/lib/admire.h

+2 −2
Original line number Diff line number Diff line
@@ -186,8 +186,8 @@ ADM_register_pfs_storage(ADM_server_t server, const char* name, 
 * successfully.

 */

ADM_return_t

ADM_update_pfs_storage(ADM_server_t server, ADM_pfs_context_t ctx,

                       ADM_pfs_storage_t adhoc_storage);

ADM_update_pfs_storage(ADM_server_t server, ADM_pfs_storage_t adhoc_storage,

                       ADM_pfs_context_t ctx);



/**

 * Remove an already-registered PFS storage tier.