Merge pull request #6117 from yosefe/topic/pml-ucx-init-req_mpi_object-v4.0.x

pml_ucx: initialize req_mpi_object.comm for error handler

ompi/mca/pml/ucx/pml_ucx.c

@@ -478,6 +478,7 @@ int mca_pml_ucx_irecv_init(void *buf, size_t count, ompi_datatype_t *datatype,
                        tag, comm, (void*)request, (void*)req);
 
     req->ompi.req_state           = OMPI_REQUEST_INACTIVE;
+    req->ompi.req_mpi_object.comm = comm;
     req->flags                    = 0;
     req->buffer                   = buf;
     req->count                    = count;
@@ -510,6 +511,7 @@ int mca_pml_ucx_irecv(void *buf, size_t count, ompi_datatype_t *datatype,
     }
 
     PML_UCX_VERBOSE(8, "got request %p", (void*)req);
+    req->req_mpi_object.comm = comm;
     *request                 = req;
     return OMPI_SUCCESS;
 }
@@ -583,12 +585,14 @@ int mca_pml_ucx_isend_init(const void *buf, size_t count, ompi_datatype_t *datat
     }
 
     req->ompi.req_state           = OMPI_REQUEST_INACTIVE;
+    req->ompi.req_mpi_object.comm = comm;
     req->flags                    = MCA_PML_UCX_REQUEST_FLAG_SEND;
     req->buffer                   = (void *)buf;
     req->count                    = count;
     req->tag                      = PML_UCX_MAKE_SEND_TAG(tag, comm);
     req->send.mode                = mode;
     req->send.ep                  = ep;
+
     if (MCA_PML_BASE_SEND_BUFFERED == mode) {
         req->datatype.ompi_datatype = datatype;
         OBJ_RETAIN(datatype);
@@ -706,6 +710,7 @@ int mca_pml_ucx_isend(const void *buf, size_t count, ompi_datatype_t *datatype,
         return OMPI_SUCCESS;
     } else if (!UCS_PTR_IS_ERR(req)) {
         PML_UCX_VERBOSE(8, "got request %p", (void*)req);
+        req->req_mpi_object.comm = comm;
         *request                 = req;
         return OMPI_SUCCESS;
     } else {

ompi/mca/pml/ucx/pml_ucx_request.c

@@ -228,7 +228,7 @@ void mca_pml_ucx_completed_request_init(ompi_request_t *ompi_req)
     mca_pml_ucx_request_init_common(ompi_req, false, OMPI_REQUEST_ACTIVE,
                                     mca_pml_completed_request_free,
                                     mca_pml_completed_request_cancel);
+    ompi_req->req_mpi_object.comm = &ompi_mpi_comm_world.comm;
     ompi_request_complete(ompi_req, false);
-
 }