From 188d529beb373736b7fc911d40caf3b39a39d0b1 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 26 Jul 2007 20:22:36 +0000 Subject: [PATCH] * We *do* need the LSF task ID as part of our vpid * Accidentally had the PLS LSF using the env SDS; switch it back to the LSF SDS This commit was SVN r15650. --- orte/mca/pls/lsf/pls_lsf_module.c | 2 +- orte/mca/sds/lsf/sds_lsf_module.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/orte/mca/pls/lsf/pls_lsf_module.c b/orte/mca/pls/lsf/pls_lsf_module.c index 15456a8b6f..4f6bb8214b 100644 --- a/orte/mca/pls/lsf/pls_lsf_module.c +++ b/orte/mca/pls/lsf/pls_lsf_module.c @@ -229,7 +229,7 @@ static int pls_lsf_launch_job(orte_jobid_t jobid) /* force orted to use the lsf sds */ opal_argv_append(&argc, &argv, "--ns-nds"); - opal_argv_append(&argc, &argv, "env"); + opal_argv_append(&argc, &argv, "lsf"); /* tell the new daemons the base of the name list so they can compute * their own name on the other end diff --git a/orte/mca/sds/lsf/sds_lsf_module.c b/orte/mca/sds/lsf/sds_lsf_module.c index e4336bd7bb..ef0b6cb7b1 100644 --- a/orte/mca/sds/lsf/sds_lsf_module.c +++ b/orte/mca/sds/lsf/sds_lsf_module.c @@ -55,6 +55,7 @@ int orte_sds_lsf_set_name(void) int rc; int id; char* name_string = NULL; + int lsf_nodeid; /* start by getting our jobid, and vpid (which is the starting vpid for the list of daemons) */ @@ -108,6 +109,10 @@ int orte_sds_lsf_set_name(void) } } + /* fix up the base name and make it the "real" name */ + lsf_nodeid = atoi(getenv("LSF_PM_TASKID")); + orte_process_info.my_name->vpid = lsf_nodeid; + /* get the non-name common environmental variables */ if (ORTE_SUCCESS != (rc = orte_sds_env_get())) { ORTE_ERROR_LOG(rc);