UCP/RNDV: Fix rndv cancel handling

yosefe · Sep 17, 2020 · 13d6039 · 13d6039
1 parent 7693cde
commit 13d6039
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/ucp/core/ucp_request.c b/src/ucp/core/ucp_request.c
@@ -420,7 +420,11 @@ void ucp_request_handle_send_error(ucp_request_t *req, ucs_status_t status)
             req->send.state.uct_comp.func(&req->send.state.uct_comp, status);
         }
     } else {
-        ucp_request_complete_send(req, status);
+        if (req->flags & UCP_REQUEST_FLAG_SEND_RNDV) {
+            ucp_rndv_complete_send(req, UCS_ERR_CANCELED, "rndv_flush");
+       } else {
+            ucp_request_complete_send(req, status);
+        }
     }
 }
 

diff --git a/src/ucp/tag/rndv.c b/src/ucp/tag/rndv.c
@@ -38,8 +38,8 @@ static int ucp_rndv_is_recv_pipeline_needed(ucp_request_t *rndv_req,
     return 1;
 }
 
-static void ucp_rndv_complete_send(ucp_request_t *sreq, ucs_status_t status,
-                                   const char *debug_status)
+void ucp_rndv_complete_send(ucp_request_t *sreq, ucs_status_t status,
+                            const char *debug_status)
 {
     ucp_worker_h worker;
     khiter_t iter;
@@ -403,7 +403,9 @@ ucs_status_t ucp_tag_send_start_rndv(ucp_request_t *sreq)
 void ucp_tag_rndv_cancel(ucp_request_t *sreq)
 {
     if (!(sreq->send.ep->flags & UCP_EP_FLAG_REMOTE_CONNECTED)) {
-        ucp_rndv_complete_send(sreq, UCS_ERR_CANCELED, "rndv_cancel");
+        if (sreq->flags & UCP_REQUEST_FLAG_RNDV_RTS_SENT) {
+            ucp_rndv_complete_send(sreq, UCS_ERR_CANCELED, "rndv_cancel");
+        }
     } else {
         sreq->send.uct.func = ucp_proto_progress_rndv_cancel;
         if (sreq->flags & UCP_REQUEST_FLAG_RNDV_RTS_SENT) {

diff --git a/src/ucp/tag/rndv.h b/src/ucp/tag/rndv.h
@@ -51,6 +51,9 @@ ucs_status_t ucp_tag_send_start_rndv(ucp_request_t *req);
 
 void ucp_tag_rndv_cancel(ucp_request_t *sreq);
 
+void ucp_rndv_complete_send(ucp_request_t *sreq, ucs_status_t status,
+                            const char *debug_status);
+
 void ucp_rndv_matched(ucp_worker_h worker, ucp_request_t *req,
                       const ucp_rndv_rts_hdr_t *rndv_rts_hdr,
                       uint64_t rts_seq);