Merge pull request openucx#5952 from evgeny-leksikov/ucp_ep_flush_int…

…ernal_failed UCP/EP/FLUSH: fix too early completion for failed EP
kunpengcompute · Nov 26, 2020 · 36ed228 · 36ed228
2 parents ab9c2f4 + a89ce65
commit 36ed228
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/ucp/rma/flush.c b/src/ucp/rma/flush.c
@@ -319,10 +319,6 @@ ucs_status_ptr_t ucp_ep_flush_internal(ucp_ep_h ep, unsigned uct_flags,
 
     ucs_debug("%s ep %p", debug_name, ep);
 
-    if (ep->flags & UCP_EP_FLAG_FAILED) {
-        return NULL;
-    }
-
     req = ucp_request_get_param(ep->worker, param,
                                 {return UCS_STATUS_PTR(UCS_ERR_NO_MEMORY);});
 
@@ -497,7 +493,8 @@ static unsigned ucp_worker_flush_progress(void *arg)
         if (UCS_PTR_IS_ERR(ep_flush_request)) {
             /* endpoint flush resulted in an error */
             status = UCS_PTR_STATUS(ep_flush_request);
-            ucs_warn("ucp_ep_flush_internal() failed: %s", ucs_status_string(status));
+            ucs_diag("ucp_ep_flush_internal() failed: %s",
+                     ucs_status_string(status));
         } else if (ep_flush_request != NULL) {
             /* endpoint flush started, increment refcount */
             ++req->flush_worker.comp_count;

diff --git a/test/gtest/ucp/ucp_test.cc b/test/gtest/ucp/ucp_test.cc
@@ -686,7 +686,7 @@ void *ucp_test_base::entity::disconnect_nb(int worker_index, int ep_index,
         return req;
     }
 
-    ASSERT_UCS_OK(UCS_PTR_STATUS(req));
+    /* close request can be completed with any status depends on peer state */
     return NULL;
 }