Skip to content

Commit 5e6f624

Browse files
committed
COLL/FCA: revert to prev barrier if called from finalize
FCA barrier may not complete if FCA progress is not called periodically. PMI/PMI2 API that can be used in rte barrier has no provision for calling external progress function. So it is possible that during finalize some ranks will be stuck in fca barrier while others are in PMI barrier.
1 parent f4a5d25 commit 5e6f624

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

ompi/mca/coll/fca/coll_fca_ops.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ int mca_coll_fca_barrier(struct ompi_communicator_t *comm,
153153
int ret;
154154

155155
FCA_VERBOSE(5,"Using FCA Barrier");
156+
if (OPAL_UNLIKELY(ompi_mpi_finalize_started)) {
157+
FCA_VERBOSE(5, "In finalize, reverting to previous barrier");
158+
goto orig_barrier;
159+
}
156160
ret = fca_do_barrier(fca_module->fca_comm);
157161
if (ret < 0) {
158162
if (ret == -EUSEMPI) {

0 commit comments

Comments
 (0)