More C/R fixes.

* Fix a typo introduced by the removal of the notifier framework
* Fix to flush the modex cached data correctly using the orte DB API.

This commit was SVN r26773.

orte/mca/errmgr/base/errmgr_base_fns.c

@@ -329,7 +329,7 @@ void orte_errmgr_base_proc_state_notify(orte_proc_state_t state, orte_process_na
         case ORTE_PROC_STATE_TERMINATED:
         case ORTE_PROC_STATE_KILLED_BY_CMD:
         case ORTE_PROC_STATE_SENSOR_BOUND_EXCEEDED:
-            opal_output(0,, "%d: Process %s is dead.",
+            opal_output(0, "%d: Process %s is dead.",
                         orte_process_info.pid, ORTE_JOBID_PRINT(proc->jobid));
             break;
 

orte/mca/ess/env/ess_env_module.c

@@ -57,6 +57,7 @@
 #include "orte/mca/rmaps/base/base.h"
 #if OPAL_ENABLE_FT_CR == 1
 #include "orte/mca/snapc/base/base.h"
+#include "orte/mca/db/db.h"
 #endif
 #include "orte/mca/filem/base/base.h"
 #include "orte/util/proc_info.h"
@@ -406,7 +407,7 @@ static int rte_ft_event(int state)
             exit_status = ret;
             goto cleanup;
         }
-        if (ORTE_SUCCESS != (ret = orte_grpcomm.purge_proc_attrs())) {
+        if (ORTE_SUCCESS != (ret = orte_db.remove(NULL, NULL))) {
             ORTE_ERROR_LOG(ret);
             exit_status = ret;
             goto cleanup;

orte/mca/snapc/full/snapc_full_global.c

@@ -46,6 +46,7 @@
 #include "orte/mca/rmaps/rmaps_types.h"
 #include "orte/mca/plm/plm.h"
 #include "orte/mca/grpcomm/grpcomm.h"
+#include "orte/mca/db/db.h"
 #include "orte/runtime/orte_wait.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/errmgr/base/base.h"
@@ -513,7 +514,7 @@ int global_coord_end_ckpt(orte_snapc_base_quiesce_t *datum)
     if( currently_migrating ) {
         OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle,
                              "Global) End Ckpt: Flush the modex cached data\n"));
-        if (ORTE_SUCCESS != (ret = orte_grpcomm.purge_proc_attrs())) {
+        if (ORTE_SUCCESS != (ret = orte_db.remove(NULL, NULL))) {
             ORTE_ERROR_LOG(ret);
             exit_status = ret;
             goto cleanup;

orte/mca/snapc/full/snapc_full_local.c

@@ -64,6 +64,7 @@
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/routed/routed.h"
 #include "orte/mca/grpcomm/grpcomm.h"
+#include "orte/mca/db/db.h"
 
 #include "orte/mca/snapc/snapc.h"
 #include "orte/mca/snapc/base/base.h"
@@ -1794,7 +1795,7 @@ static void snapc_full_local_comm_read_event(int fd, short flags, void *arg)
     if( currently_migrating && !flushed_modex ) {
         OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle,
                              "Local) Read Event: Flush the modex cached data\n"));
-        if (ORTE_SUCCESS != (ret = orte_grpcomm.purge_proc_attrs())) {
+        if (ORTE_SUCCESS != (ret = orte_db.remove(NULL, NULL))) {
             ORTE_ERROR_LOG(ret);
             exit_status = ret;
             goto cleanup;