Provide better messages when we don't find any included interfaces, and/or don't find any interfaces for use by OOB.

cmr=v1.7.5:reviewer=jsquyres

This commit was SVN r30675.

orte/mca/oob/Makefile.am

@@ -21,6 +21,9 @@
 noinst_LTLIBRARIES = libmca_oob.la
 libmca_oob_la_SOURCES =
 
+# pkgdata setup
+dist_ompidata_DATA =
+
 # local files
 headers = oob.h
 libmca_oob_la_SOURCES += $(headers)

orte/mca/oob/base/Makefile.am

@@ -11,6 +11,7 @@
 #                         All rights reserved.
 # Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
 #                         reserved.
+# Copyright (c) 2014      Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -18,6 +19,8 @@
 # $HEADER$
 #
 
+dist_ompidata_DATA += base/help-oob-base.txt
+
 headers += \
 	base/base.h
 

orte/mca/oob/base/help-oob-base.txt

@@ -0,0 +1,23 @@
+# -*- text -*-
+#
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2006 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2014      Intel, Inc. All rights reserved
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+#
+[no-interfaces-avail]
+No network interfaces were found for out-of-band communications. We require
+at least one available network for out-of-band messaging.

orte/mca/oob/base/oob_base_select.c

@@ -12,6 +12,7 @@
  * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -29,6 +30,8 @@
 #include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 
+#include "orte/util/show_help.h"
+
 #include "orte/runtime/orte_globals.h"
 #include "orte/mca/oob/oob.h"
 #include "orte/mca/oob/base/base.h"
@@ -116,7 +119,8 @@ int orte_oob_base_select(void)
         /* no support available means we really cannot run */
         opal_output_verbose(5, orte_oob_base_framework.framework_output,
                             "mca:oob:select: Init failed to return any available transports");
-        return ORTE_ERR_NOT_AVAILABLE;
+        orte_show_help("help-oob-base.txt", "no-interfaces-avail", true);
+        return ORTE_ERR_SILENT;
     }
 
     /* provide them an index so we can track their usability in a bitmap */

orte/mca/oob/tcp/Makefile.am

@@ -12,6 +12,7 @@
 # Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2013 Los Alamos National Security, LLC.
 #                         All rights reserved
+# Copyright (c) 2014      Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,6 +20,8 @@
 # $HEADER$
 #
 
+dist_ompidata_DATA = help-oob-tcp.txt
+
 sources = \
           oob_tcp_component.h \
           oob_tcp.h \

orte/mca/oob/tcp/help-oob-tcp.txt

@@ -41,7 +41,7 @@ communications and will therefore abort. Please correct the network
 specification and retry.
 #
 [no-included-found]
-None of the networks specified to be included for out-of-band communications
+None of the TCP networks specified to be included for out-of-band communications
 could be found:
 
   Value given: %s
@@ -49,17 +49,13 @@ could be found:
 Please revise the specification and try again.
 #
 [excluded-all]
-The specified list of networks to be excluded for out-of-band communications
+The specified list of networks to be excluded for TCP out-of-band communications
 resulted in no networks being available:
 
   Value given: %s
 
 Please revise the specification and try again.
 #
-[no-interfaces-avail]
-No network interfaces were found for out-of-band communications. We require
-at least one available network for TCP-based messaging.
-#
 [invalid if_inexclude]
 WARNING: An invalid value was given for oob_tcp_if_%s.  This
 value will be ignored.

orte/mca/oob/tcp/oob_tcp_component.c

@@ -13,7 +13,7 @@
  *                         All rights reserved.
  * Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2013      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2013-2014 Intel, Inc.  All rights reserved.
  * Copyright (c) 2014      NVIDIA Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
@@ -589,8 +589,6 @@ static bool component_available(void)
             orte_show_help("help-oob-tcp.txt", "no-included-found", true, mca_oob_tcp_component.if_include);
         } else if (excluding) {
             orte_show_help("help-oob-tcp.txt", "excluded-all", true, mca_oob_tcp_component.if_exclude);
-        } else {
-            orte_show_help("help-oob-tcp.txt", "no-interfaces-avail", true);
         }
         return false;
     }