edb2cbd150
The SnapC Full local Coordinator used this argument to attach to the job the daemon would be launching. So once this option was removed C/R support broke. This commit has the local coordinator attach to the job just before it is launched by the ODLS module. This is a much cleaner solution, and will eventually allow the SnapC modules to attach to multiple jobs launched on a single machine. This commit fixes the C/R regression introduced in r15007. This commit was SVN r15121. The following SVN revision numbers were found above: r15007 --> open-mpi/ompi@85df3bd92f
228 строки
6.4 KiB
C
228 строки
6.4 KiB
C
/*
|
|
* Copyright (c) 2004-2007 The Trustees of Indiana University.
|
|
* All rights reserved.
|
|
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
|
* 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$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "orte_config.h"
|
|
|
|
#include <sys/types.h>
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif /* HAVE_UNISTD_H */
|
|
|
|
#include "orte/orte_constants.h"
|
|
#include "opal/mca/mca.h"
|
|
#include "opal/mca/base/base.h"
|
|
|
|
#include "opal/util/output.h"
|
|
#include "opal/mca/base/mca_base_param.h"
|
|
|
|
#include "opal/util/output.h"
|
|
#include "opal/util/show_help.h"
|
|
#include "opal/util/argv.h"
|
|
#include "opal/util/opal_environ.h"
|
|
|
|
#include "orte/mca/snapc/snapc.h"
|
|
#include "orte/mca/snapc/base/base.h"
|
|
|
|
#include "snapc_full.h"
|
|
|
|
/*
|
|
* Full module
|
|
*/
|
|
static orte_snapc_base_module_t loc_module = {
|
|
/** Initialization Function */
|
|
orte_snapc_full_module_init,
|
|
/** Finalization Function */
|
|
orte_snapc_full_module_finalize,
|
|
orte_snapc_full_setup_job,
|
|
orte_snapc_full_release_job
|
|
};
|
|
|
|
/*
|
|
* Global Snapshot structure
|
|
*/
|
|
void orte_snapc_full_construct(orte_snapc_full_global_snapshot_t *obj);
|
|
void orte_snapc_full_destruct( orte_snapc_full_global_snapshot_t *obj);
|
|
|
|
OBJ_CLASS_INSTANCE(orte_snapc_full_global_snapshot_t,
|
|
orte_snapc_base_global_snapshot_t,
|
|
orte_snapc_full_construct,
|
|
orte_snapc_full_destruct);
|
|
|
|
/************************************
|
|
* Locally Global vars & functions :)
|
|
************************************/
|
|
|
|
|
|
/************************
|
|
* Function Definitions
|
|
************************/
|
|
void orte_snapc_full_construct(orte_snapc_full_global_snapshot_t *snapshot) {
|
|
;
|
|
}
|
|
|
|
void orte_snapc_full_destruct( orte_snapc_full_global_snapshot_t *snapshot) {
|
|
;
|
|
}
|
|
|
|
/*
|
|
* MCA Functions
|
|
*/
|
|
orte_snapc_base_module_1_0_0_t *
|
|
orte_snapc_full_component_query(int *priority)
|
|
{
|
|
opal_output_verbose(10, mca_snapc_full_component.super.output_handle,
|
|
"snapc:full: component_query()");
|
|
|
|
*priority = mca_snapc_full_component.super.priority;
|
|
|
|
return &loc_module;
|
|
}
|
|
|
|
int orte_snapc_full_module_init(bool seed, bool app)
|
|
{
|
|
int ret, exit_status = ORTE_SUCCESS;
|
|
|
|
opal_output_verbose(10, mca_snapc_full_component.super.output_handle,
|
|
"snapc:full: module_init(%d, %d)", seed, app);
|
|
|
|
/*
|
|
* Global Snapshot Coordinator
|
|
*/
|
|
if(seed) {
|
|
opal_output_verbose(5, mca_snapc_full_component.super.output_handle,
|
|
"snapc:full: module_init: Global Snapshot Coordinator");
|
|
|
|
mca_snapc_full_component.super.coord_type = ORTE_SNAPC_GLOBAL_COORD_TYPE;
|
|
|
|
if( ORTE_SUCCESS != (ret = global_coord_init()) ) {
|
|
exit_status = ret;
|
|
goto cleanup;
|
|
}
|
|
}
|
|
/*
|
|
* Local Snapshot Coordinator -- orted
|
|
*/
|
|
else if(!seed && !app) {
|
|
/*
|
|
* JJH Currently we are not guarenteed a bootproxy, and we have no way
|
|
* JJH (that I know of) to tell if we were generated from the bootproxy
|
|
* JJH or from the HNP inside the application.
|
|
* JJH so for this component we assume that there exists a local coordinator
|
|
*/
|
|
opal_output_verbose(5, mca_snapc_full_component.super.output_handle,
|
|
"snapc:full: module_init: Local Snapshot Coordinator");
|
|
|
|
mca_snapc_full_component.super.coord_type = ORTE_SNAPC_LOCAL_COORD_TYPE;
|
|
|
|
if( ORTE_SUCCESS != (ret = local_coord_init()) ) {
|
|
exit_status = ret;
|
|
goto cleanup;
|
|
}
|
|
}
|
|
/*
|
|
* Application Snapshot Coordinator
|
|
*/
|
|
else if(app) {
|
|
opal_output_verbose(5, mca_snapc_full_component.super.output_handle,
|
|
"snapc:full: module_init: Application Snapshot Coordinator");
|
|
|
|
mca_snapc_full_component.super.coord_type = ORTE_SNAPC_APP_COORD_TYPE;
|
|
|
|
if( ORTE_SUCCESS != (ret = app_coord_init()) ) {
|
|
exit_status = ret;
|
|
goto cleanup;
|
|
}
|
|
}
|
|
else {
|
|
/*
|
|
* Logically this should not happen
|
|
*/
|
|
opal_output_verbose(5, mca_snapc_full_component.super.output_handle,
|
|
"snapc:full: module_init: Unknown Snapshot Coordinator");
|
|
|
|
mca_snapc_full_component.super.coord_type = ORTE_SNAPC_UNASSIGN_TYPE;
|
|
|
|
exit_status = ORTE_ERROR;
|
|
goto cleanup;
|
|
}
|
|
|
|
cleanup:
|
|
return exit_status;
|
|
}
|
|
|
|
int orte_snapc_full_module_finalize(void)
|
|
{
|
|
opal_output_verbose(10, mca_snapc_full_component.super.output_handle,
|
|
"snapc:full: module_finalize()");
|
|
|
|
switch(mca_snapc_full_component.super.coord_type)
|
|
{
|
|
case ORTE_SNAPC_GLOBAL_COORD_TYPE:
|
|
global_coord_finalize();
|
|
break;
|
|
case ORTE_SNAPC_LOCAL_COORD_TYPE:
|
|
local_coord_finalize();
|
|
break;
|
|
case ORTE_SNAPC_APP_COORD_TYPE:
|
|
app_coord_finalize();
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
mca_snapc_full_component.super.coord_type = ORTE_SNAPC_UNASSIGN_TYPE;
|
|
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
int orte_snapc_full_setup_job(orte_jobid_t jobid) {
|
|
int ret, exit_status = ORTE_SUCCESS;
|
|
|
|
if( ORTE_SNAPC_GLOBAL_COORD_TYPE == mca_snapc_full_component.super.coord_type ) {
|
|
if(ORTE_SUCCESS != (ret = global_coord_setup_job(jobid) ) ) {
|
|
exit_status = ret;
|
|
}
|
|
}
|
|
else if( ORTE_SNAPC_LOCAL_COORD_TYPE == mca_snapc_full_component.super.coord_type ) {
|
|
if(ORTE_SUCCESS != (ret = local_coord_setup_job(jobid) ) ) {
|
|
exit_status = ret;
|
|
}
|
|
}
|
|
|
|
return exit_status;
|
|
}
|
|
|
|
int orte_snapc_full_release_job(orte_jobid_t jobid) {
|
|
int ret, exit_status = ORTE_SUCCESS;
|
|
|
|
if( ORTE_SNAPC_GLOBAL_COORD_TYPE == mca_snapc_full_component.super.coord_type ) {
|
|
if(ORTE_SUCCESS != (ret = global_coord_release_job(jobid) ) ) {
|
|
exit_status = ret;
|
|
}
|
|
}
|
|
else if( ORTE_SNAPC_LOCAL_COORD_TYPE == mca_snapc_full_component.super.coord_type ) {
|
|
if(ORTE_SUCCESS != (ret = local_coord_release_job(jobid) ) ) {
|
|
exit_status = ret;
|
|
}
|
|
}
|
|
|
|
return exit_status;
|
|
}
|
|
|
|
/******************
|
|
* Local functions
|
|
******************/
|