From e95b204505074fe33aafca260bd2d4cfb0e06b5b Mon Sep 17 00:00:00 2001
From: Ali Mohammed <ali.mohammed@hpe.com>
Date: Thu, 26 Jan 2023 17:41:33 +0100
Subject: [PATCH] read appid from op
---
maestro/pool_client.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/maestro/pool_client.c b/maestro/pool_client.c
index 6d9c3245..a82b78ee 100644
--- a/maestro/pool_client.c
+++ b/maestro/pool_client.c
@@ -713,7 +713,7 @@ mstro_pc__init_transfer_send_ticket(mstro_pool_operation op)
break;
case MSTRO__POOL__TRANSFER_TICKET__TICKET_OFI: {
NOISE("TICKET CASE RDMA\n");
- appid.id = init->dst_appid->id;
+ appid.id = op->pc_transport.target_appid;
ofi.dstid = &appid;
struct mstro_pm_app_registry_entry *e;
mstro_status status = mstro_pm_app_lookup(appid.id, &e);
@@ -735,7 +735,7 @@ mstro_pc__init_transfer_send_ticket(mstro_pool_operation op)
}
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", op->pc_transport.target_appid, op->pc_transport.target_cdo->name);
NOISE("TransferTicket using path %s\n", ticket.gfs->path);
NOISE("TransferTicket cdo size %" PRIi64 "\n", ticket.data_size);
@@ -769,10 +769,10 @@ mstro_pc__init_transfer_send_ticket(mstro_pool_operation op)
return MSTRO_FAIL;
}
- status = mstro_pmp_send_nowait(init->dst_appid->id, &msg);
+ status = mstro_pmp_send_nowait(op->pc_transport.target_appid, &msg);
if(status!=MSTRO_OK) {
ERR("Cannot send ticket to %zu: %d (%s)\n",
- init->dst_appid->id, status, mstro_status_description(status));
+ op->pc_transport.target_appid, status, mstro_status_description(status));
return MSTRO_FAIL;
}
@@ -959,9 +959,9 @@ mstro_pc__prepare_init_transfer(mstro_pool_operation op)
}
DEBUG("Initiating transfer from src app %" PRIappid " (me) to dst app %" PRIappid " of CDO %s\n",
- g_pool_app_id, init->dst_appid->id, op->pc_transport.target_cdo->name);
+ g_pool_app_id, op->pc_transport.target_appid, op->pc_transport.target_cdo->name);
- if(g_pool_app_id==init->dst_appid->id) {
+ if(g_pool_app_id==op->pc_transport.target_appid) {
WARN("FIXME: We will be talking to ourselves via transport, should use a shortcut\n");
}
--
GitLab