Commit 7578bb06 authored by Ramon Nou's avatar Ramon Nou
Browse files

Id-op and error deploy

parent a6296c99

src/lib/detail/impl.cpp

+4 −4
Original line number Diff line number Diff line
@@ -379,16 +379,16 @@ deploy_adhoc_storage(const server& srv, 


    if(const auto rv = admire::error_code{out.retval}; !rv) {

        LOGGER_ERROR("rpc id: {} name: {} from: {} <= "

                     "body: {{retval: {}}}",

                     "body: {{retval: {}}} [op_id: {}]",

                     rpc_id, std::quoted("ADM_"s + __FUNCTION__),

                     std::quoted(rpc_client.self_address()), rv);

                     std::quoted(rpc_client.self_address()), rv, out.op_id);

        return rv;

    }



    LOGGER_INFO("rpc id: {} name: {} from: {} <= "

                "body: {{retval: {}}}]",

                "body: {{retval: {}}}] [op_id: {}]",

                rpc_id, std::quoted("ADM_"s + __FUNCTION__),

                admire::error_code::success);

                admire::error_code::success, out.op_id);



    return admire::error_code::success;

}

src/scord/rpc_handlers.cpp

+4 −4
Original line number Diff line number Diff line
@@ -499,11 +499,11 @@ ADM_deploy_adhoc_storage(hg_handle_t h) { 
                execvpe("gkfs", const_cast<char* const*>(args.data()),

                        const_cast<char* const*>(env.data()));

                LOGGER_INFO("ADM_deploy_adhoc_storage() script didn't execute");

                exit(0);

                exit(EXIT_FAILURE);

                break;

            }

            case -1: {

                ec = ec.other;

                ec = admire::error_code::other;

                LOGGER_ERROR("rpc id: {} name: {} to: {} <= "

                             "body: {{retval: {}}}",

                             rpc_id, std::quoted(__FUNCTION__),
@@ -514,9 +514,9 @@ ADM_deploy_adhoc_storage(hg_handle_t h) { 
                int wstatus = 0;

                waitpid(pid, &wstatus, 0);

                if(WEXITSTATUS(wstatus) != 0) {

                    ec = ec.other;

                    ec = admire::error_code::other;

                } else {

                    ec = ec.success;

                    ec = admire::error_code::success;

                }

                break;

            }