Skip to content
Snippets Groups Projects
Commit 2c1fdd05 authored by Ramon Nou's avatar Ramon Nou
Browse files

Added common, rebased with error code

parent b73f0ac1
No related branches found
No related tags found
1 merge request!40Resolve "Refactor library RPC implementation of `admire::deploy_adhoc_storage`"
Pipeline #3365 passed
......@@ -24,7 +24,7 @@
#include <fmt/format.h>
#include <admire.hpp>
#include "common.hpp"
int
main(int argc, char* argv[]) {
......@@ -37,19 +37,19 @@ main(int argc, char* argv[]) {
}
admire::server server{"tcp", argv[1]};
std::vector<admire::node> nodes{admire::node{"node1"},admire::node{"node2"}};
std::vector<admire::node> nodes = prepare_nodes(10);
admire::adhoc_storage::resources res(nodes);
admire::adhoc_storage adhoc_storage(
admire::storage::type::dataclay, "foobar", 1,
admire::adhoc_storage::execution_mode::separate_new,
admire::adhoc_storage::access_type::read_write,
res, 100, false);
admire::storage::type::dataclay, "foobar", 1,
admire::adhoc_storage::execution_mode::separate_new,
admire::adhoc_storage::access_type::read_write, res, 100, false);
ADM_return_t ret = ADM_SUCCESS;
try {
ret = admire::deploy_adhoc_storage(server, adhoc_storage);
admire::deploy_adhoc_storage(server, adhoc_storage);
} catch(const std::exception& e) {
fmt::print(stderr, "FATAL: ADM_deploy_adhoc_storage() failed: {}\n",
e.what());
......
......@@ -283,9 +283,16 @@ remove_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage) {
}
}
ADM_return_t
void
deploy_adhoc_storage(const server& srv, const admire::adhoc_storage& adhoc_storage) {
return detail::deploy_adhoc_storage(srv, adhoc_storage);
const auto ec = detail::deploy_adhoc_storage(srv, adhoc_storage);
if(!ec) {
throw std::runtime_error(fmt::format(
"ADM_deploy_adhoc_storage() error: {}", ec.message()));
}
}
ADM_return_t
......
......@@ -69,7 +69,7 @@ update_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage,
void
remove_adhoc_storage(const server& srv, const adhoc_storage& adhoc_storage);
ADM_return_t
void
deploy_adhoc_storage(const server& srv, const adhoc_storage& reqs);
ADM_return_t
......
......@@ -129,7 +129,7 @@ ADM_deploy_adhoc_storage(ADM_server_t server, ADM_storage_t adhoc_storage) {
adhoc_storage->s_name,
adhoc_storage->s_id, adhoc_storage->s_adhoc_ctx};
return admire::deploy_adhoc_storage(srv, storage);
return admire::detail::deploy_adhoc_storage(srv, storage);
}
ADM_return_t
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment