Rewrite `ADM_update_pfs_storage` RPC (a36850f4) · Commits · eu / ADMIRE / scord

src/lib/detail/impl.cpp

+25 −32

Original line number	Diff line number	Diff line
		@@ -493,48 +493,41 @@ register_pfs_storage(const server& srv, const std::string& name,

		admire::error_code
		update_pfs_storage(const server& srv, const pfs_storage& pfs_storage,
		const admire::pfs_storage::ctx& pfs_storage_ctx) {
		const admire::pfs_storage::ctx& new_ctx) {

		(void) srv;
		(void) pfs_storage;
		(void) pfs_storage_ctx;

		return admire::error_code::snafu;

		#if 0
		scord::network::rpc_client rpc_client{srv.protocol(), rpc_registration_cb};
		scord::network::client rpc_client{srv.protocol()};

		const auto rpc_id = ::api::remote_procedure::new_id();
		auto endp = rpc_client.lookup(srv.address());

		if(const auto& lookup_rv = rpc_client.lookup(srv.address());
		lookup_rv.has_value()) {
		const auto& endp = lookup_rv.value();

		LOGGER_INFO("rpc id: {} name: {} from: {} => "
		"body: {{pfs_storage_id: {}}}",
		"body: {{pfs_id: {}, new_ctx: {}}}",
		rpc_id, std::quoted("ADM_"s + __FUNCTION__),
		std::quoted(rpc_client.self_address()), pfs_storage.id());

		const auto rpc_ctx = api::convert(pfs_storage_ctx);
		std::quoted(rpc_client.self_address()), pfs_storage.id(),
		new_ctx);

		ADM_update_pfs_storage_in_t in{rpc_ctx.get(), pfs_storage.id()};
		ADM_update_pfs_storage_out_t out;
		if(const auto& call_rv =
		endp.call("ADM_"s + __FUNCTION__, pfs_storage.id(), new_ctx);
		call_rv.has_value()) {

		const auto rpc = endp.call("ADM_update_pfs_storage", &in, &out);
		const scord::network::generic_response resp{call_rv.value()};

		if(const auto rv = admire::error_code{out.retval}; !rv) {
		LOGGER_ERROR("rpc id: {} name: {} from: {} <= "
		LOGGER_EVAL(resp.error_code(), INFO, ERROR,
		"rpc id: {} name: {} from: {} <= "
		"body: {{retval: {}}} [op_id: {}]",
		rpc_id, std::quoted("ADM_"s + __FUNCTION__),
		std::quoted(rpc.origin()), rv, out.op_id);
		return rv;
		}
		std::quoted(endp.address()), resp.error_code(),
		resp.op_id());

		LOGGER_INFO("rpc id: {} name: {} from: {} <= "
		"body: {{retval: {}}} [op_id: {}]",
		rpc_id, std::quoted("ADM_"s + __FUNCTION__),
		std::quoted(rpc.origin()), admire::error_code::success,
		out.op_id);
		return resp.error_code();
		}
		}

		return admire::error_code::success;
		#endif
		LOGGER_ERROR("rpc call failed");
		return admire::error_code::other;
		}

		admire::error_code

src/lib/detail/impl.hpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ register_pfs_storage(const server& srv, const std::string& name,

		admire::error_code
		update_pfs_storage(const server& srv, const pfs_storage& pfs_storage,
		const admire::pfs_storage::ctx& pfs_storage_ctx);
		const admire::pfs_storage::ctx& new_ctx);

		admire::error_code
		remove_pfs_storage(const server& srv, const pfs_storage& pfs_storage);

src/scord/rpc_handlers.cpp

+15 −35

Original line number	Diff line number	Diff line
		@@ -443,60 +443,40 @@ register_pfs_storage(const request& req, const std::string& name,
		req.respond(resp);
		}

		} // namespace scord::network::handlers


		static void
		ADM_update_pfs_storage(hg_handle_t h) {

		using scord::network::utils::get_address;

		[[maybe_unused]] hg_return_t ret;

		ADM_update_pfs_storage_in_t in;
		ADM_update_pfs_storage_out_t out;

		[[maybe_unused]] margo_instance_id mid = margo_hg_handle_get_instance(h);

		ret = margo_get_input(h, &in);
		assert(ret == HG_SUCCESS);
		void
		update_pfs_storage(const request& req, std::uint64_t pfs_id,
		const admire::pfs_storage::ctx& new_ctx) {

		const admire::pfs_storage::ctx pfs_storage_ctx(in.pfs_storage_ctx);
		const std::uint64_t server_id(in.server_id);
		using scord::network::get_address;

		const auto rpc_name = "ADM_"s + __FUNCTION__;
		const auto rpc_id = remote_procedure::new_id();

		LOGGER_INFO("rpc id: {} name: {} from: {} => "
		"body: {{pfs_storage_id: {}}}",
		rpc_id, std::quoted(__FUNCTION__), std::quoted(get_address(h)),
		server_id);
		"body: {{pfs_id: {}, new_ctx: {}}}",
		rpc_id, std::quoted(rpc_name), std::quoted(get_address(req)),
		pfs_id, new_ctx);

		auto& pfs_manager = scord::pfs_storage_manager::instance();
		const auto ec = pfs_manager.update(server_id, pfs_storage_ctx);
		const auto ec = pfs_manager.update(pfs_id, new_ctx);

		if(!ec) {
		LOGGER_ERROR("rpc id: {} error_msg: \"Error updating pfs_storage: {}\"",
		rpc_id, ec);
		}

		out.op_id = rpc_id;
		out.retval = ec;
		const auto resp = generic_response{rpc_id, ec};

		LOGGER_INFO("rpc id: {} name: {} to: {} => "
		"body: {{retval: {}}}",
		rpc_id, std::quoted(__FUNCTION__), std::quoted(get_address(h)),
		rpc_id, std::quoted(rpc_name), std::quoted(get_address(req)),
		ec);

		ret = margo_respond(h, &out);
		assert(ret == HG_SUCCESS);

		ret = margo_free_input(h, &in);
		assert(ret == HG_SUCCESS);

		ret = margo_destroy(h);
		assert(ret == HG_SUCCESS);
		req.respond(resp);
		}

		DEFINE_MARGO_RPC_HANDLER(ADM_update_pfs_storage);
		} // namespace scord::network::handlers


		static void
		ADM_remove_pfs_storage(hg_handle_t h) {

src/scord/rpc_handlers.hpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -65,6 +65,10 @@ register_pfs_storage(const request& req, const std::string& name,
		enum admire::pfs_storage::type type,
		const admire::pfs_storage::ctx& ctx);

		void
		update_pfs_storage(const request& req, std::uint64_t pfs_id,
		const admire::pfs_storage::ctx& new_ctx);

		} // namespace scord::network::handlers

		#include <margo.h>
		@@ -76,9 +80,6 @@ extern "C" {
		// FIXME: cannot be in a namespace due to Margo limitations
		// namespace scord::network::rpc {

		/// ADM_update_pfs_storage
		DECLARE_MARGO_RPC_HANDLER(ADM_update_pfs_storage);

		/// ADM_remove_pfs_storage
		DECLARE_MARGO_RPC_HANDLER(ADM_remove_pfs_storage);

src/scord/scord.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,8 @@ main(int argc, char* argv[]) {
		scord::network::handlers::deploy_adhoc_storage);
		daemon.set_handler("ADM_register_pfs_storage"s,
		scord::network::handlers::register_pfs_storage);
		daemon.set_handler("ADM_update_pfs_storage"s,
		scord::network::handlers::update_pfs_storage);

		#if 0
		const auto rpc_registration_cb = [](auto&& ctx) {