Temporary work around for #1693 (osu_bibw segfault in xrc + coalescing mode)

This commit was SVN r20093.

ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c

@@ -409,7 +409,7 @@ static int xoob_send_qp_create (mca_btl_base_endpoint_t* endpoint)
     if (qp_init_attr.cap.max_inline_data < req_inline) {
         endpoint->qps[0].ib_inline_max = qp_init_attr.cap.max_inline_data;
         orte_show_help("help-mpi-btl-openib-cpc-base.txt",
-                       "inline truncated", orte_process_info.nodename,
+                       "inline truncated", true, orte_process_info.nodename,
                        ibv_get_device_name(openib_btl->device->ib_dev),
                        req_inline, qp_init_attr.cap.max_inline_data);
     } else {
@@ -954,6 +954,13 @@ static int xoob_component_query(mca_btl_openib_module_t *openib_btl,
                             ibv_get_device_name(openib_btl->device->ib_dev));
         return OMPI_ERR_NOT_SUPPORTED;
     }
+    
+    /* Print warning and switch off coalescing mode (ticket #1693)*/
+    if (mca_btl_openib_component.use_message_coalescing) {
+        orte_show_help("help-mpi-btl-openib-cpc-base.txt",
+                "bug #1693", true, orte_process_info.nodename);
+        mca_btl_openib_component.use_message_coalescing = 0;
+    }
 
     *cpc = malloc(sizeof(ompi_btl_openib_connect_base_module_t));
     if (NULL == *cpc) {

ompi/mca/btl/openib/connect/help-mpi-btl-openib-cpc-base.txt

@@ -38,3 +38,19 @@ a smaller inline data value than was requested.
   Local device:         %s
   Requested value:      %d
   Value used by device: %d
+#
+[bug #1693]
+WARNING: ConnectX XRC support was enabled together with coalescing
+mode.  This combination is not supported in this version of Open MPI
+because it may cause random seg faults (please see Open MPI bug ticket
+#1693 https://svn.open-mpi.org/trac/ompi/ticket/1693 for more
+details).  Message coalescing has been disabled in this job to prevent
+catastrophic failure.
+
+You can silence this warning either by disabling XRC (i.e., not specifying
+an "X" queue in btl_openib_receive_queues) or disabling message
+coalescing by setting the btl_openib_use_message_coalescing MCA
+parameter to 0.
+
+  Local host:           %s
+#