1
1

Fix a problem introduced by r15390 which was causing strange failures in numerous areas.

We no longer store whether we are a singleton in a MCA parameter, we now use a global constant. So all references to the MCA parameter must be removed.

This commit was SVN r15408.

The following SVN revision numbers were found above:
  r15390 --> open-mpi/ompi@bd65f8ba88
Этот коммит содержится в:
Tim Prins 2007-07-13 17:52:16 +00:00
родитель d4d5a351c1
Коммит d2f0806420
2 изменённых файлов: 3 добавлений и 12 удалений

Просмотреть файл

@ -194,7 +194,7 @@ CLEANUP:
int
orte_sds_base_seed_set_name(void)
{
int id, flag, rc;
int rc;
/* if we are a seed, then there can be only one proc */
orte_process_info.num_procs = 1;
@ -204,9 +204,7 @@ orte_sds_base_seed_set_name(void)
/* if we're a seed and we're not infrastructure, we're also a
singleton. So set the singleton flag in that case */
id = mca_base_param_find("orte", NULL, "infrastructure");
mca_base_param_lookup_int(id, &flag);
if (!flag) {
if (!orte_infrastructure) {
orte_process_info.singleton = true;
}
/* now need to create our name in a manner that puts our job info on the name service

Просмотреть файл

@ -111,7 +111,7 @@ int orte_setup_hnp(char *target_cluster, char *headnode, char *username)
char *keys[4], *tokens[3], *cellname;
struct timeval tv;
struct timespec ts;
bool infrastructure = true, *bptr, tf_flag;
bool *bptr, tf_flag;
/* get the nodename for the headnode of the target cluster */
if (NULL == headnode) { /* not provided, so try to look it up */
@ -486,13 +486,6 @@ MOVEON:
OPAL_THREAD_UNLOCK(&orte_setup_hnp_mutex);
if (ORTE_SUCCESS == orte_setup_hnp_rc) {
/* Remember if we were infrastructure or not */
id = mca_base_param_find("orte", NULL, "infrastructure");
mca_base_param_lookup_int(id, &intparam);
if ( ((int)true) != intparam) {
infrastructure = false;
}
/* need to restart the local system so it can connect to the remote daemon. */
if (ORTE_SUCCESS != (rc = orte_restart(orte_setup_hnp_cbdata.name, orte_setup_hnp_orted_uri))) {
/** can't use ORTE_ERROR_LOG here as it may no longer be valid. Since we may