Disable old Margo code (8afe4ac1) · Commits · eu / ADMIRE / scord

src/lib/admire.cpp

+30 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,8 @@ init_logger() {
		}
		}


		#if 0
		void
		rpc_registration_cb(scord::network::rpc_client* client) {

		@@ -192,6 +194,7 @@ rpc_registration_cb(scord::network::rpc_client* client) {
		REGISTER_RPC(client, "ADM_get_statistics", ADM_get_statistics_in_t,
		ADM_get_statistics_out_t, NULL, true);
		}
		#endif

		} // namespace

		@@ -359,6 +362,7 @@ set_dataset_information(const server& srv, ADM_job_t job, ADM_dataset_t target,
		(void) target;
		(void) info;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -378,6 +382,7 @@ set_dataset_information(const server& srv, ADM_job_t job, ADM_dataset_t target,
		}

		LOGGER_INFO("ADM_set_dataset_information() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		@@ -389,6 +394,7 @@ set_io_resources(const server& srv, ADM_job_t job, ADM_adhoc_storage_t tier,
		(void) tier;
		(void) resources;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -408,6 +414,7 @@ set_io_resources(const server& srv, ADM_job_t job, ADM_adhoc_storage_t tier,
		}

		LOGGER_INFO("ADM_set_io_resources() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		@@ -419,6 +426,7 @@ get_transfer_priority(const server& srv, ADM_job_t job, ADM_transfer_t transfer,
		(void) transfer;
		(void) priority;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -436,6 +444,7 @@ get_transfer_priority(const server& srv, ADM_job_t job, ADM_transfer_t transfer,
		}

		LOGGER_INFO("ADM_get_transfer_priority() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		@@ -447,6 +456,7 @@ set_transfer_priority(const server& srv, ADM_job_t job, ADM_transfer_t transfer,
		(void) transfer;
		(void) incr;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -464,15 +474,18 @@ set_transfer_priority(const server& srv, ADM_job_t job, ADM_transfer_t transfer,
		}

		LOGGER_INFO("ADM_set_transfer_priority() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		ADM_return_t
		cancel_transfer(const server& srv, ADM_job_t job, ADM_transfer_t transfer) {

		(void) srv;
		(void) job;
		(void) transfer;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -491,6 +504,7 @@ cancel_transfer(const server& srv, ADM_job_t job, ADM_transfer_t transfer) {
		}

		LOGGER_INFO("ADM_cancel_transfer() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		@@ -501,6 +515,7 @@ get_pending_transfers(const server& srv, ADM_job_t job,
		(void) job;
		(void) pending_transfers;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -519,6 +534,7 @@ get_pending_transfers(const server& srv, ADM_job_t job,
		}

		LOGGER_INFO("ADM_get_pending_transfers() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		@@ -530,6 +546,7 @@ set_qos_constraints(const server& srv, ADM_job_t job, ADM_qos_entity_t entity,
		(void) entity;
		(void) limit;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -552,6 +569,7 @@ set_qos_constraints(const server& srv, ADM_job_t job, ADM_qos_entity_t entity,
		}

		LOGGER_INFO("ADM_set_qos_constraints() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		@@ -563,6 +581,7 @@ get_qos_constraints(const server& srv, ADM_job_t job, ADM_qos_entity_t entity,
		(void) entity;
		(void) limits;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -583,6 +602,7 @@ get_qos_constraints(const server& srv, ADM_job_t job, ADM_qos_entity_t entity,
		}

		LOGGER_INFO("ADM_get_qos_constraints() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		@@ -595,6 +615,7 @@ define_data_operation(const server& srv, ADM_job_t job, const char* path,
		(void) op;
		(void) args;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -617,6 +638,7 @@ define_data_operation(const server& srv, ADM_job_t job, const char* path,
		}

		LOGGER_INFO("ADM_define_data_operation() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		@@ -630,6 +652,7 @@ connect_data_operation(const server& srv, ADM_job_t job, ADM_dataset_t input,
		(void) should_stream;
		(void) args;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -651,6 +674,7 @@ connect_data_operation(const server& srv, ADM_job_t job, ADM_dataset_t input,
		}

		LOGGER_INFO("ADM_connect_data_operation() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		@@ -663,6 +687,7 @@ finalize_data_operation(const server& srv, ADM_job_t job,
		(void) op;
		(void) status;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -681,6 +706,7 @@ finalize_data_operation(const server& srv, ADM_job_t job,
		}

		LOGGER_INFO("ADM_finalize_data_operation() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		@@ -696,6 +722,7 @@ link_transfer_to_data_operation(const server& srv, ADM_job_t job,
		(void) should_stream;
		(void) args;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -717,6 +744,7 @@ link_transfer_to_data_operation(const server& srv, ADM_job_t job,
		}

		LOGGER_INFO("ADM_link_transfer_to_data_operation() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

		@@ -726,6 +754,7 @@ get_statistics(const server& srv, ADM_job_t job, ADM_job_stats_t** stats) {
		(void) job;
		(void) stats;

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

		auto endp = rpc_client.lookup(srv.address());
		@@ -744,6 +773,7 @@ get_statistics(const server& srv, ADM_job_t job, ADM_job_stats_t** stats) {
		}

		LOGGER_INFO("ADM_get_statistics() = {}", ADM_SUCCESS);
		#endif
		return ADM_SUCCESS;
		}

src/lib/detail/impl.cpp

+114 −14

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@

		using namespace std::literals;

		#if 0
		void
		rpc_registration_cb(scord::network::rpc_client* client) {

		@@ -157,6 +158,7 @@ rpc_registration_cb(scord::network::rpc_client* client) {
		REGISTER_RPC(client, "ADM_get_statistics", ADM_get_statistics_in_t,
		ADM_get_statistics_out_t, NULL, true);
		}
		#endif

		namespace api {

		@@ -175,33 +177,48 @@ namespace admire::detail {
		admire::error_code
		ping(const server& srv) {

		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) {
		const auto& endp = lookup_rv.value();

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

		ADM_ping_out_t out;
		if(const auto call_rv = endp.call("ADM_"s + __FUNCTION__); call_rv) {

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

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

		return admire::error_code::success;
		}
		}

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

		tl::expected<admire::job, admire::error_code>
		register_job(const server& srv, const job::resources& job_resources,
		const job_requirements& reqs, admire::slurm_job_id slurm_id) {

		(void) srv;
		(void) job_resources;
		(void) reqs;
		(void) slurm_id;

		return tl::make_unexpected(admire::error_code::snafu);

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

		const auto rpc_id = ::api::remote_procedure::new_id();
		@@ -240,12 +257,20 @@ register_job(const server& srv, const job::resources& job_resources,
		out.op_id);

		return job;
		#endif
		}

		admire::error_code
		update_job(const server& srv, const job& job,
		const job::resources& job_resources) {

		(void) srv;
		(void) job;
		(void) job_resources;

		return admire::error_code::snafu;

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

		const auto rpc_id = ::api::remote_procedure::new_id();
		@@ -278,11 +303,19 @@ update_job(const server& srv, const job& job,
		std::quoted(rpc.origin()), admire::error_code::success,
		out.op_id);
		return admire::error_code::success;
		#endif
		}

		admire::error_code
		remove_job(const server& srv, const job& job) {

		(void) srv;
		(void) job;

		return admire::error_code::snafu;

		#if 0

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

		const auto rpc_id = ::api::remote_procedure::new_id();
		@@ -314,6 +347,7 @@ remove_job(const server& srv, const job& job) {
		std::quoted(rpc.origin()), admire::error_code::success,
		out.op_id);
		return admire::error_code::success;
		#endif
		}

		tl::expected<admire::adhoc_storage, admire::error_code>
		@@ -321,6 +355,14 @@ register_adhoc_storage(const server& srv, const std::string& name,
		enum adhoc_storage::type type,
		const adhoc_storage::ctx& ctx) {

		(void) srv;
		(void) name;
		(void) type;
		(void) ctx;

		return tl::make_unexpected(admire::error_code::snafu);

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

		const auto rpc_id = ::api::remote_procedure::new_id();
		@@ -357,11 +399,18 @@ register_adhoc_storage(const server& srv, const std::string& name,
		admire::error_code::success, out.id, out.op_id);

		return rpc_adhoc_storage;
		#endif
		}

		admire::error_code
		deploy_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage) {

		(void) srv;
		(void) adhoc_storage;

		return admire::error_code::snafu;

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

		const auto rpc_id = ::api::remote_procedure::new_id();
		@@ -392,6 +441,7 @@ deploy_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage) {
		admire::error_code::success, out.op_id);

		return admire::error_code::success;
		#endif
		}

		tl::expected<transfer, error_code>
		@@ -401,6 +451,16 @@ transfer_datasets(const server& srv, const job& job,
		const std::vector<qos::limit>& limits,
		transfer::mapping mapping) {

		(void) srv;
		(void) job;
		(void) sources;
		(void) targets;
		(void) limits;
		(void) mapping;

		return tl::make_unexpected(admire::error_code::snafu);

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

		const auto rpc_id = ::api::remote_procedure::new_id();
		@@ -442,6 +502,7 @@ transfer_datasets(const server& srv, const job& job,
		std::quoted(rpc.origin()), admire::error_code::success, tx,
		out.op_id);
		return tx;
		#endif
		}

		admire::error_code
		@@ -449,6 +510,13 @@ update_adhoc_storage(const server& srv,
		const adhoc_storage::ctx& adhoc_storage_ctx,
		const adhoc_storage& adhoc_storage) {

		(void) srv;
		(void) adhoc_storage_ctx;
		(void) adhoc_storage;

		return admire::error_code::snafu;

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

		const auto rpc_id = ::api::remote_procedure::new_id();
		@@ -481,11 +549,18 @@ update_adhoc_storage(const server& srv,
		out.op_id);

		return admire::error_code::success;
		#endif
		}

		admire::error_code
		remove_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage) {

		(void) srv;
		(void) adhoc_storage;

		return admire::error_code::snafu;

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

		const auto rpc_id = ::api::remote_procedure::new_id();
		@@ -515,12 +590,21 @@ remove_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage) {
		std::quoted(rpc.origin()), admire::error_code::success,
		out.op_id);
		return admire::error_code::success;
		#endif
		}

		tl::expected<admire::pfs_storage, admire::error_code>
		register_pfs_storage(const server& srv, const std::string& name,
		enum pfs_storage::type type, const pfs_storage::ctx& ctx) {

		(void) srv;
		(void) name;
		(void) type;
		(void) ctx;

		return tl::make_unexpected(admire::error_code::snafu);

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

		const auto rpc_id = ::api::remote_procedure::new_id();
		@@ -557,12 +641,20 @@ register_pfs_storage(const server& srv, const std::string& name,
		admire::error_code::success, out.id, out.op_id);

		return rpc_pfs_storage;
		#endif
		}

		admire::error_code
		update_pfs_storage(const server& srv, const pfs_storage& pfs_storage,
		const admire::pfs_storage::ctx& pfs_storage_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};

		const auto rpc_id = ::api::remote_procedure::new_id();
		@@ -595,11 +687,18 @@ update_pfs_storage(const server& srv, const pfs_storage& pfs_storage,
		out.op_id);

		return admire::error_code::success;
		#endif
		}

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

		(void) srv;
		(void) pfs_storage;

		return admire::error_code::snafu;

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

		const auto rpc_id = ::api::remote_procedure::new_id();
		@@ -630,6 +729,7 @@ remove_pfs_storage(const server& srv, const pfs_storage& pfs_storage) {
		out.op_id);

		return admire::error_code::success;
		#endif
		}

		} // namespace admire::detail