From 5fb7c7d23b0acd7f946cd6312e2b4948d4f930a9 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 27 Aug 2014 16:18:05 +0000 Subject: [PATCH] Don't explicitly add the hostname to the data fetch when we already cached a remote blob This commit was SVN r32619. --- orte/orted/pmix/pmix_server_sendrecv.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/orte/orted/pmix/pmix_server_sendrecv.c b/orte/orted/pmix/pmix_server_sendrecv.c index 6c000c3f5c..271ef4bfee 100644 --- a/orte/orted/pmix/pmix_server_sendrecv.c +++ b/orte/orted/pmix/pmix_server_sendrecv.c @@ -1031,26 +1031,10 @@ static void process_message(pmix_server_peer_t *peer) return; } /* xfer the data - the blobs are in the buffer, - * so don't repack them */ + * so don't repack them. They will include the remote + * hostname, so don't add it again */ opal_dss.copy_payload(reply, &buf); OBJ_DESTRUCT(&buf); - /* pass the hostname */ - OBJ_CONSTRUCT(&buf, opal_buffer_t); - if (OPAL_SUCCESS != (rc = opal_dss.pack(&buf, &proc->node->name, 1, OPAL_STRING))) { - ORTE_ERROR_LOG(rc); - OBJ_RELEASE(reply); - OBJ_DESTRUCT(&buf); - return; - } - /* pack the blob */ - bptr = &buf; - if (OPAL_SUCCESS != (rc = opal_dss.pack(reply, &bptr, 1, OPAL_BUFFER))) { - ORTE_ERROR_LOG(rc); - OBJ_RELEASE(reply); - OBJ_DESTRUCT(&buf); - return; - } - OBJ_DESTRUCT(&buf); PMIX_SERVER_QUEUE_SEND(peer, tag, reply); return; }