Merge pull request #10621 from MamziB/mamzi/flush-opal-progress

janjust · web-flow · commit ed1ccf305f3a · 2022-08-16T13:55:12.000-05:00
OSC/UCX: Fix the opal_progress call condition inside flush
diff --git a/opal/mca/common/ucx/common_ucx_wpool.h b/opal/mca/common/ucx/common_ucx_wpool.h
@@ -294,7 +294,7 @@ static inline int opal_common_ucx_wait_request_mt(ucs_status_ptr_t request, cons
                 break;
             }
             ctr--;
-        } while (ctr > 0 && ret > 0 && status == UCS_INPROGRESS);
+        } while (ctr > 0 && ret == 0 && status == UCS_INPROGRESS);
         opal_mutex_unlock(&winfo->mutex);
         if (!ctr) {
             opal_progress();

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ static inline int opal_common_ucx_wait_request_mt(ucs_status_ptr_t request, cons`
`294`	`294`	`break;`
`295`	`295`	`}`
`296`	`296`	`ctr--;`
`297`		`- } while (ctr > 0 && ret > 0 && status == UCS_INPROGRESS);`
	`297`	`+ } while (ctr > 0 && ret == 0 && status == UCS_INPROGRESS);`
`298`	`298`	`opal_mutex_unlock(&winfo->mutex);`
`299`	`299`	`if (!ctr) {`
`300`	`300`	`opal_progress();`