ulfm: Consistency error check fixes in ishrink implementation

Signed-off-by: Lisandro Dalcin <[email protected]>

Author: dalcinl

ompi/communicator/ft/comm_ft.c

@@ -416,6 +416,7 @@ struct ompi_comm_ishrink_context_t {
     ompi_group_t *failed_group;
     ompi_group_t *alive_group;
     ompi_group_t *alive_rgroup;
+    int flag;
     double start;
 };
 typedef struct ompi_comm_ishrink_context_t ompi_comm_ishrink_context_t;
@@ -429,7 +430,6 @@ static int ompi_comm_ishrink_check_activate(ompi_comm_request_t *request);
 int ompi_comm_ishrink_internal(ompi_communicator_t* comm, ompi_communicator_t** newcomm, ompi_request_t** req)
 {
     int rc;
-    int flag = 1;
 #if OPAL_ENABLE_DEBUG
     double stop;
 #endif
@@ -479,7 +479,8 @@ int ompi_comm_ishrink_internal(ompi_communicator_t* comm, ompi_communicator_t**
      * the value of flag, instead we are only using the globally consistent
      * return value.
      */
-    rc = comm->c_coll->coll_iagree( &flag,
+    context->flag = 1;
+    rc = comm->c_coll->coll_iagree( &context->flag,
                                     1,
                                     &ompi_mpi_int.dt,
                                     &ompi_mpi_op_band.op,
@@ -508,7 +509,7 @@ static int ompi_comm_ishrink_check_agree(ompi_comm_request_t *request) {
     ompi_communicator_t *comm = context->comm;
     ompi_request_t *subreq[1];
     ompi_group_t *comm_group = NULL;
-    int rc, flag = 1;
+    int rc;
 #if OPAL_ENABLE_DEBUG
     double stop;
 #endif
@@ -522,13 +523,17 @@ static int ompi_comm_ishrink_check_agree(ompi_comm_request_t *request) {
     rc = request->super.req_status.MPI_ERROR;
     if( (OMPI_SUCCESS != rc) && (MPI_ERR_PROC_FAILED != rc) ) {
         opal_output(0, "%s:%d Agreement failure: %d\n", __FILE__, __LINE__, rc);
+        ompi_comm_request_return(request);
+        OBJ_RELEASE(context->failed_group);
         return rc;
     }
 
     if( MPI_ERR_PROC_FAILED == rc ) {
         /* previous round found more failures, redo */
+        OBJ_RELEASE(context->failed_group);
         request->super.req_status.MPI_ERROR = MPI_SUCCESS;
-        rc = comm->c_coll->coll_iagree( &flag,
+        context->flag = 1;
+        rc = comm->c_coll->coll_iagree( &context->flag,
                                         1,
                                         &ompi_mpi_int.dt,
                                         &ompi_mpi_op_band.op,
@@ -575,7 +580,6 @@ static int ompi_comm_ishrink_check_agree(ompi_comm_request_t *request) {
         }
     }
     OBJ_RELEASE(context->failed_group);
-    context->failed_group = NULL;
 
     rc = ompi_comm_set_nb( context->newcomm,         /* new comm */
                            comm,                     /* old comm */
@@ -614,15 +618,16 @@ static int ompi_comm_ishrink_check_setrank(ompi_comm_request_t *request) {
 
     /* cleanup temporary groups */
     OBJ_RELEASE(context->alive_group);
-    context->alive_group = NULL;
     if( NULL != context->alive_rgroup ) {
         OBJ_RELEASE(context->alive_rgroup);
     }
-    context->alive_rgroup = NULL;
 
     /* check errors in prior step */
-    if( NULL == *context->newcomm ) {
-        rc = MPI_ERR_INTERN;
+    rc = request->super.req_status.MPI_ERROR;
+    if( OMPI_SUCCESS != rc ) {
+        opal_output_verbose(1, ompi_ftmpi_output_handle,
+                            "%s ompi: comm_ishrink: Construction failed with error %d",
+                            OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), rc);
         ompi_comm_request_return(request);
         OBJ_RELEASE(*context->newcomm);
         return rc;
@@ -719,6 +724,7 @@ static int ompi_comm_ishrink_check_cid(ompi_comm_request_t *request) {
                                 mode,
                                 subreq );
     if( OMPI_SUCCESS != rc ) {
+        ompi_comm_request_return(request);
         OBJ_RELEASE(*context->newcomm);
         return rc;
     }
@@ -729,18 +735,23 @@ static int ompi_comm_ishrink_check_cid(ompi_comm_request_t *request) {
 }
 
 static int ompi_comm_ishrink_check_activate(ompi_comm_request_t *request) {
+    ompi_comm_ishrink_context_t *context =
+        (ompi_comm_ishrink_context_t *)request->context;
     int rc;
 #if OPAL_ENABLE_DEBUG
     double stop;
 #endif
 
     rc = request->super.req_status.MPI_ERROR;
     if( OMPI_SUCCESS != rc ) {
+        opal_output_verbose(1, ompi_ftmpi_output_handle,
+                            "%s ompi: comm_ishrink: Activation failed with error %d",
+                            OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), rc);
+        ompi_comm_request_return(request);
+        OBJ_RELEASE(*context->newcomm);
         return rc;
     }
 #if OPAL_ENABLE_DEBUG
-    ompi_comm_ishrink_context_t *context =
-        (ompi_comm_ishrink_context_t *)request->context;
     stop = MPI_Wtime();
     OPAL_OUTPUT_VERBOSE((10, ompi_ftmpi_output_handle,
                          "%s ompi: comm_ishrink: COLL SELECT: %g seconds\n",