diff --git a/orte/mca/notifier/ftb/help-ftb-event-schema.txt b/orte/mca/notifier/ftb/help-ftb-event-schema.txt index 77e0a574e1..363cfb6ba8 100644 --- a/orte/mca/notifier/ftb/help-ftb-event-schema.txt +++ b/orte/mca/notifier/ftb/help-ftb-event-schema.txt @@ -17,7 +17,7 @@ ftb.mpi.openmpi FTB_MPI_PROCS_DEAD ERROR FTB_MPI_PROCS_UNREACHABLE ERROR -FTB_MPI_PROCS_COMM_ERROR WARN +FTB_MPI_PROCS_COMM_ERROR WARNING FTB_MPI_PROCS_MIGRATED INFO FTB_MPI_PROCS_MIGRATE_FAIL ERROR FTB_MPI_PROCS_CKPTED INFO @@ -26,4 +26,4 @@ FTB_MPI_PROCS_RESTARTED INFO FTB_MPI_PROCS_RESTART_FAIL ERROR FTB_MPI_PROCS_ABORTED ERROR -end \ No newline at end of file +end diff --git a/orte/mca/notifier/ftb/notifier_ftb_module.c b/orte/mca/notifier/ftb/notifier_ftb_module.c index 6f1d1b1b9c..df14a19191 100644 --- a/orte/mca/notifier/ftb/notifier_ftb_module.c +++ b/orte/mca/notifier/ftb/notifier_ftb_module.c @@ -36,6 +36,9 @@ #include "orte/mca/ess/ess.h" #include "orte/util/show_help.h" +#include "orte/mca/snapc/snapc.h" +#include "orte/mca/snapc/base/base.h" + #include "orte/mca/notifier/base/base.h" #include "notifier_ftb.h" @@ -118,29 +121,25 @@ static const char* get_ftb_event_severity(orte_notifier_base_severity_t severity static const char* get_ftb_event_name(int errnum) { - /* If it an OMPI error, translate it to an equivalent FTB event */ - if (ORTE_SUCCESS > errnum) { - switch (errnum) { + switch (errnum) { - case ORTE_SNAPC_CKPT_STATE_ESTABLISHED: - case ORTE_SNAPC_CKPT_STATE_RECOVERED: - return FTB_EVENT(FTB_MPI_PROCS_CKPTED); + case ORTE_SNAPC_CKPT_STATE_ESTABLISHED: + return FTB_EVENT(FTB_MPI_PROCS_CKPTED); - case ORTE_SNAPC_CKPT_STATE_NO_CKPT: - case ORTE_SNAPC_CKPT_STATE_ERROR: - return FTB_EVENT(FTB_MPI_PROCS_CKPT_FAIL); + case ORTE_SNAPC_CKPT_STATE_NO_CKPT: + case ORTE_SNAPC_CKPT_STATE_ERROR: + return FTB_EVENT(FTB_MPI_PROCS_CKPT_FAIL); - case ORTE_ERR_CONNECTION_REFUSED: - case ORTE_ERR_CONNECTION_FAILED: - case ORTE_ERR_UNREACH: - return FTB_EVENT(FTB_MPI_PROCS_UNREACHABLE); + case ORTE_ERR_CONNECTION_REFUSED: + case ORTE_ERR_CONNECTION_FAILED: + case ORTE_ERR_UNREACH: + return FTB_EVENT(FTB_MPI_PROCS_UNREACHABLE); - case ORTE_ERR_COMM_FAILURE: - return FTB_EVENT(FTB_MPI_PROCS_COMM_ERROR); + case ORTE_ERR_COMM_FAILURE: + return FTB_EVENT(FTB_MPI_PROCS_COMM_ERROR); - default: - return NULL; - } + default: + return NULL; } return NULL;