Skip to content
Snippets Groups Projects
Commit 418b18a4 authored by Ali Mohammed's avatar Ali Mohammed
Browse files

make sure we use target appid for src and dst paths

parent 6f29a15e
Branches
No related tags found
No related merge requests found
...@@ -106,7 +106,7 @@ mstro_pc__transfer_completed(mstro_pool_operation op); ...@@ -106,7 +106,7 @@ mstro_pc__transfer_completed(mstro_pool_operation op);
/** /**
* @brief Checks dst app registry entry. * @brief Checks dst app registry entry.
* If dst app is in the registry returns MSTRO_OK, and jumps directly to @ref mstro_pc__init_transfer_reg_app for writing the ticket * If dst app is in the registry returns MSTRO_OK, and jumps directly to writing the ticket
* If dst app info is currently being read in another thread, returns MSTRO_WOULDBLOCK * If dst app info is currently being read in another thread, returns MSTRO_WOULDBLOCK
* If dst app is not in registry, issues a read (mstro_ofi__select_endpoint) and returns MSTRO_OK * If dst app is not in registry, issues a read (mstro_ofi__select_endpoint) and returns MSTRO_OK
* @param op operation handle * @param op operation handle
...@@ -124,7 +124,7 @@ mstro_pc__app_befriend(mstro_pool_operation op); ...@@ -124,7 +124,7 @@ mstro_pc__app_befriend(mstro_pool_operation op);
* @return mstro_status return status * @return mstro_status return status
*/ */
mstro_status mstro_status
mstro_pc__init_transfer_reg_app(mstro_pool_operation op); mstro_pc__reg_friend_app(mstro_pool_operation op);
/** /**
* @brief Writes and sends the transfer ticket * @brief Writes and sends the transfer ticket
......
...@@ -35,7 +35,7 @@ const mstro_pool_op_st_handler mstro_pc__init_transfer_steps[] = { ...@@ -35,7 +35,7 @@ const mstro_pool_op_st_handler mstro_pc__init_transfer_steps[] = {
NULL, NULL,
mstro_pc__prepare_init_transfer, mstro_pc__prepare_init_transfer,
mstro_pc__app_befriend, mstro_pc__app_befriend,
mstro_pc__init_transfer_reg_app, mstro_pc__reg_friend_app,
mstro_pc__init_transfer_send_ticket, mstro_pc__init_transfer_send_ticket,
NULL, NULL,
NULL, NULL,
...@@ -48,7 +48,7 @@ const mstro_pool_op_st_handler mstro_pc__transfer_steps[] = { ...@@ -48,7 +48,7 @@ const mstro_pool_op_st_handler mstro_pc__transfer_steps[] = {
NULL, NULL,
mstro_pc__prepare_transfer, mstro_pc__prepare_transfer,
mstro_pc__app_befriend, /**optional*/ mstro_pc__app_befriend, /**optional*/
mstro_pc__init_transfer_reg_app, /*optional*/ mstro_pc__reg_friend_app, /*optional*/
mstro_pc__transfer_execute, mstro_pc__transfer_execute,
NULL, NULL,
NULL, NULL,
...@@ -734,7 +734,7 @@ mstro_pc__init_transfer_send_ticket(mstro_pool_operation op) ...@@ -734,7 +734,7 @@ mstro_pc__init_transfer_send_ticket(mstro_pool_operation op)
return MSTRO_FAIL; return MSTRO_FAIL;
} }
ticket.attributes = op->pc_transport.target_cdo->attributes_msg; ticket.attributes = op->pc_transport.target_cdo->attributes_msg;
assert(op->pc_transport.target_appid == init->dst_appid->id);
INFO("Issued ticket to app %" PRIu64 " for CDO %s, and starting execute process\n", init->dst_appid->id, op->pc_transport.target_cdo->name); INFO("Issued ticket to app %" PRIu64 " for CDO %s, and starting execute process\n", init->dst_appid->id, op->pc_transport.target_cdo->name);
NOISE("TransferTicket using path %s\n", ticket.gfs->path); NOISE("TransferTicket using path %s\n", ticket.gfs->path);
...@@ -793,7 +793,7 @@ mstro_pc__init_transfer_send_ticket(mstro_pool_operation op) ...@@ -793,7 +793,7 @@ mstro_pc__init_transfer_send_ticket(mstro_pool_operation op)
} }
mstro_status mstro_status
mstro_pc__init_transfer_reg_app(mstro_pool_operation op) mstro_pc__reg_friend_app(mstro_pool_operation op)
{ {
mstro_status status = MSTRO_UNIMPL; mstro_status status = MSTRO_UNIMPL;
...@@ -806,7 +806,7 @@ mstro_pc__init_transfer_reg_app(mstro_pool_operation op) ...@@ -806,7 +806,7 @@ mstro_pc__init_transfer_reg_app(mstro_pool_operation op)
status = mstro_request_wait(op->pc_transport.request); status = mstro_request_wait(op->pc_transport.request);
if(status!=MSTRO_OK) { if(status!=MSTRO_OK) {
ERR("Async endpoint selection failed, could not find suitable endpoint to talk to app %" PRIappid ": %d\n", ERR("Async endpoint selection failed, could not find suitable endpoint to talk to app %" PRIappid ": %d\n",
op->msg->initiate_transfer->dst_appid->id, status); op->pc_transport.target_appid, status);
return status; return status;
} }
} }
...@@ -837,10 +837,10 @@ mstro_pc__init_transfer_reg_app(mstro_pool_operation op) ...@@ -837,10 +837,10 @@ mstro_pc__init_transfer_reg_app(mstro_pool_operation op)
op->pc_transport.target_addr, op->pc_transport.target_addr,
strdup(op->pc_transport.target_serialized_endpoint), strdup(op->pc_transport.target_serialized_endpoint),
op->pc_transport.methods, op->pc_transport.methods,
op->msg->initiate_transfer->dst_appid->id, op->pc_transport.target_appid,
NULL); NULL);
if(status!=MSTRO_OK) { if(status!=MSTRO_OK) {
ERR("Failed to register peer app %zu: %d\n", op->msg->initiate_transfer->dst_appid->id); ERR("Failed to register peer app %zu: %d\n", op->pc_transport.target_appid);
} else { } else {
DEBUG("Registered peer app %zu\n", op->pc_transport.target_appid); DEBUG("Registered peer app %zu\n", op->pc_transport.target_appid);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment