Resolve "Refactor library RPC implementation of `admire::remove_pfs_storage`" (!71) · Merge requests · eu / ADMIRE / scord

examples/cxx/ADM_remove_pfs_storage.cpp

+10 −11

Changes for examples/cxx/ADM_remove_pfs_storage.cpp: 10 added lines, 11 removed lines.
Original line number	Diff line number	Diff line
		@@ -37,24 +37,23 @@ main(int argc, char* argv[]) {

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

		ADM_pfs_storage_t pfs_storage{};
		ADM_return_t ret = ADM_SUCCESS;
		std::string pfs_name = "gpfs_scratch";
		std::string pfs_mount = "/gpfs/scratch";

		try {
		ret = admire::remove_pfs_storage(server, 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::remove_pfs_storage(server, pfs_storage);
		} catch(const std::exception& e) {
		fmt::print(stderr, "FATAL: ADM_remove_pfs_storage() failed: {}\n",
		fmt::print(stderr,
		"FATAL: ADM_register_pfs_storage() or "
		"ADM_remove_pfs_storage() failed: {}\n",
		e.what());
		exit(EXIT_FAILURE);
		}

		if(ret != ADM_SUCCESS) {
		fmt::print(stdout,
		"ADM_remove_pfs_storage() remote procedure not completed "
		"successfully\n");
		exit(EXIT_FAILURE);
		}

		fmt::print(stdout, "ADM_remove_pfs_storage() remote procedure completed "
		"successfully\n");
		}

+9 −2

Changes for src/common/net/proto/rpc_types.h: 9 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -416,9 +416,16 @@ MERCURY_GEN_PROC(
		);

		/// ADM_remove_pfs_storage
		MERCURY_GEN_PROC(ADM_remove_pfs_storage_in_t, ((int32_t) (reqs)))
		MERCURY_GEN_PROC(
		ADM_remove_pfs_storage_in_t,
		((hg_uint64_t) (server_id))
		);

		MERCURY_GEN_PROC(ADM_remove_pfs_storage_out_t, ((int32_t) (ret)))
		MERCURY_GEN_PROC(
		ADM_remove_pfs_storage_out_t,
		((hg_uint64_t) (op_id))
		((hg_int32_t) (retval))
		);

		/// ADM_input
		MERCURY_GEN_PROC(ADM_input_in_t,

+35 −0

Changes for src/lib/detail/impl.cpp: 35 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -594,4 +594,39 @@ update_pfs_storage(const server& srv, const pfs_storage& pfs_storage,
		return admire::error_code::success;
		}

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

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

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

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

		ADM_remove_pfs_storage_in_t in{pfs_storage.id()};
		ADM_remove_pfs_storage_out_t out;

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

		if(const auto rv = admire::error_code{out.retval}; !rv) {
		LOGGER_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;
		}

		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 admire::error_code::success;
		}

		} // namespace admire::detail

+3 −0

Changes for src/lib/detail/impl.hpp: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -76,6 +76,9 @@ admire::error_code
		update_pfs_storage(const server& srv, const pfs_storage& pfs_storage,
		const admire::pfs_storage::ctx& pfs_storage_ctx);

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

		} // namespace admire::detail

		#endif // SCORD_ADMIRE_IMPL_HPP

+6 −20

Changes for src/lib/admire.cpp: 6 added lines, 20 removed lines.
Original line number	Diff line number	Diff line
		@@ -322,29 +322,15 @@ update_pfs_storage(const server& srv, const pfs_storage& pfs_storage,
		}
		}

		ADM_return_t
		remove_pfs_storage(const server& srv, ADM_pfs_storage_t pfs_storage) {
		(void) srv;
		(void) pfs_storage;

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

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

		LOGGER_INFO("ADM_remove_pfs_storage(...)");

		ADM_remove_pfs_storage_in_t in{};
		ADM_remove_pfs_storage_out_t out;
		void
		remove_pfs_storage(const server& srv, const pfs_storage& pfs_storage) {

		const auto rpc = endp.call("ADM_remove_pfs_storage", &in, &out);
		const auto ec = detail::remove_pfs_storage(srv, pfs_storage);

		if(out.ret < 0) {
		LOGGER_ERROR("ADM_remove_pfs_storage() = {}", out.ret);
		return static_cast<ADM_return_t>(out.ret);
		if(!ec) {
		throw std::runtime_error(fmt::format(
		"ADM_remove_pfs_storage() error: {}", ec.message()));
		}

		LOGGER_INFO("ADM_remove_pfs_storage() = {}", ADM_SUCCESS);
		return ADM_SUCCESS;
		}

		admire::transfer