2008-02-28 01:57:57 +00:00
|
|
|
/*
|
2010-03-23 21:28:02 +00:00
|
|
|
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
|
2008-02-28 01:57:57 +00:00
|
|
|
* University Research and Technology
|
|
|
|
* Corporation. All rights reserved.
|
|
|
|
* Copyright (c) 2004-2007 The University of Tennessee and The University
|
|
|
|
* of Tennessee Research Foundation. All rights
|
|
|
|
* reserved.
|
|
|
|
* Copyright (c) 2004-2006 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 (c) 2006-2007 Cisco Systems, Inc. All rights reserved.
|
2011-11-26 02:33:05 +00:00
|
|
|
* Copyright (c) 2007-2011 Los Alamos National Security, LLC. All rights
|
2008-02-28 01:57:57 +00:00
|
|
|
* reserved.
|
2009-02-18 18:02:38 +00:00
|
|
|
* Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved.
|
2011-03-29 07:46:59 +00:00
|
|
|
* Copyright (c) 2011 IBM Corporation. All rights reserved.
|
2008-02-28 01:57:57 +00:00
|
|
|
* $COPYRIGHT$
|
|
|
|
*
|
|
|
|
* Additional copyrights may follow
|
|
|
|
*
|
|
|
|
* $HEADER$
|
|
|
|
*
|
|
|
|
* These symbols are in a file by themselves to provide nice linker
|
|
|
|
* semantics. Since linkers generally pull in symbols by object
|
|
|
|
* files, keeping these symbols as the only symbols in this file
|
|
|
|
* prevents utility programs such as "ompi_info" from having to import
|
|
|
|
* entire components just to query their version and parameters.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "orte_config.h"
|
|
|
|
#include "orte/constants.h"
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
#include <errno.h>
|
|
|
|
#include <string.h>
|
|
|
|
#ifdef HAVE_STRINGS_H
|
|
|
|
#include <strings.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
|
|
#include <sys/select.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_TIME_H
|
|
|
|
#include <sys/time.h>
|
|
|
|
#endif
|
2011-11-27 01:49:42 +00:00
|
|
|
#ifdef HAVE_TIME_H
|
|
|
|
#include <time.h>
|
|
|
|
#endif
|
2008-02-28 01:57:57 +00:00
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
|
|
#include <sys/types.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_STAT_H
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
|
|
#include <sys/wait.h>
|
|
|
|
#endif
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#ifdef HAVE_PWD_H
|
|
|
|
#include <pwd.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "opal/mca/installdirs/installdirs.h"
|
|
|
|
#include "opal/mca/base/mca_base_param.h"
|
2009-02-14 02:26:12 +00:00
|
|
|
#include "opal/util/output.h"
|
Update libevent to the 2.0 series, currently at 2.0.7rc. We will update to their final release when it becomes available. Currently known errors exist in unused portions of the libevent code. This revision passes the IBM test suite on a Linux machine and on a standalone Mac.
This is a fairly intrusive change, but outside of the moving of opal/event to opal/mca/event, the only changes involved (a) changing all calls to opal_event functions to reflect the new framework instead, and (b) ensuring that all opal_event_t objects are properly constructed since they are now true opal_objects.
Note: Shiqing has just returned from vacation and has not yet had a chance to complete the Windows integration. Thus, this commit almost certainly breaks Windows support on the trunk. However, I want this to have a chance to soak for as long as possible before I become less available a week from today (going to be at a class for 5 days, and thus will only be sparingly available) so we can find and fix any problems.
Biggest change is moving the libevent code from opal/event to a new opal/mca/event framework. This was done to make it much easier to update libevent in the future. New versions can be inserted as a new component and tested in parallel with the current version until validated, then we can remove the earlier version if we so choose. This is a statically built framework ala installdirs, so only one component will build at a time. There is no selection logic - the sole compiled component simply loads its function pointers into the opal_event struct.
I have gone thru the code base and converted all the libevent calls I could find. However, I cannot compile nor test every environment. It is therefore quite likely that errors remain in the system. Please keep an eye open for two things:
1. compile-time errors: these will be obvious as calls to the old functions (e.g., opal_evtimer_new) must be replaced by the new framework APIs (e.g., opal_event.evtimer_new)
2. run-time errors: these will likely show up as segfaults due to missing constructors on opal_event_t objects. It appears that it became a typical practice for people to "init" an opal_event_t by simply using memset to zero it out. This will no longer work - you must either OBJ_NEW or OBJ_CONSTRUCT an opal_event_t. I tried to catch these cases, but may have missed some. Believe me, you'll know when you hit it.
There is also the issue of the new libevent "no recursion" behavior. As I described on a recent email, we will have to discuss this and figure out what, if anything, we need to do.
This commit was SVN r23925.
2010-10-24 18:35:54 +00:00
|
|
|
#include "opal/mca/event/event.h"
|
2008-02-28 01:57:57 +00:00
|
|
|
#include "opal/util/argv.h"
|
|
|
|
#include "opal/util/opal_environ.h"
|
|
|
|
#include "opal/util/basename.h"
|
2011-11-26 02:33:05 +00:00
|
|
|
#include "opal/util/path.h"
|
2009-07-13 02:29:17 +00:00
|
|
|
#include "opal/class/opal_pointer_array.h"
|
2008-02-28 01:57:57 +00:00
|
|
|
|
2008-06-09 14:53:58 +00:00
|
|
|
#include "orte/util/show_help.h"
|
2008-02-28 01:57:57 +00:00
|
|
|
#include "orte/runtime/orte_wait.h"
|
|
|
|
#include "orte/runtime/orte_globals.h"
|
|
|
|
#include "orte/util/name_fns.h"
|
2008-04-30 19:49:53 +00:00
|
|
|
#include "orte/util/nidmap.h"
|
2009-05-04 11:07:40 +00:00
|
|
|
#include "orte/util/proc_info.h"
|
2008-02-28 01:57:57 +00:00
|
|
|
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
#include "orte/mca/debugger/debugger.h"
|
2008-02-28 01:57:57 +00:00
|
|
|
#include "orte/mca/rml/rml.h"
|
2009-02-14 02:26:12 +00:00
|
|
|
#include "orte/mca/rml/rml_types.h"
|
2008-10-31 21:10:00 +00:00
|
|
|
#include "orte/mca/ess/ess.h"
|
2009-02-09 20:44:44 +00:00
|
|
|
#include "orte/mca/ess/base/base.h"
|
2008-02-28 01:57:57 +00:00
|
|
|
#include "orte/mca/errmgr/errmgr.h"
|
|
|
|
#include "orte/mca/rmaps/rmaps.h"
|
2008-04-14 18:26:08 +00:00
|
|
|
#include "orte/mca/routed/routed.h"
|
2009-12-02 20:29:32 +00:00
|
|
|
#include "orte/mca/rml/base/rml_contact.h"
|
2008-02-28 01:57:57 +00:00
|
|
|
|
|
|
|
#include "orte/mca/plm/plm.h"
|
|
|
|
#include "orte/mca/plm/base/base.h"
|
|
|
|
#include "orte/mca/plm/base/plm_private.h"
|
|
|
|
#include "orte/mca/plm/rsh/plm_rsh.h"
|
|
|
|
|
2011-11-26 02:33:05 +00:00
|
|
|
static int rsh_init(void);
|
|
|
|
static int rsh_launch(orte_job_t *jdata);
|
2008-04-14 18:26:08 +00:00
|
|
|
static int remote_spawn(opal_buffer_t *launch);
|
2011-11-26 02:33:05 +00:00
|
|
|
static int rsh_terminate_orteds(void);
|
|
|
|
static int rsh_finalize(void);
|
2008-02-28 01:57:57 +00:00
|
|
|
|
|
|
|
orte_plm_base_module_t orte_plm_rsh_module = {
|
2011-11-26 02:33:05 +00:00
|
|
|
rsh_init,
|
2008-02-28 01:57:57 +00:00
|
|
|
orte_plm_base_set_hnp_name,
|
2011-11-26 02:33:05 +00:00
|
|
|
rsh_launch,
|
2008-04-14 18:26:08 +00:00
|
|
|
remote_spawn,
|
2009-07-13 02:29:17 +00:00
|
|
|
orte_plm_base_orted_terminate_job,
|
2011-11-26 02:33:05 +00:00
|
|
|
rsh_terminate_orteds,
|
2009-07-13 02:29:17 +00:00
|
|
|
orte_plm_base_orted_kill_local_procs,
|
2011-11-26 02:33:05 +00:00
|
|
|
orte_plm_base_orted_signal_local_procs,
|
|
|
|
rsh_finalize
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef enum {
|
|
|
|
ORTE_PLM_RSH_SHELL_BASH = 0,
|
|
|
|
ORTE_PLM_RSH_SHELL_ZSH,
|
|
|
|
ORTE_PLM_RSH_SHELL_TCSH,
|
|
|
|
ORTE_PLM_RSH_SHELL_CSH,
|
|
|
|
ORTE_PLM_RSH_SHELL_KSH,
|
|
|
|
ORTE_PLM_RSH_SHELL_SH,
|
|
|
|
ORTE_PLM_RSH_SHELL_UNKNOWN
|
|
|
|
} orte_plm_rsh_shell_t;
|
|
|
|
|
|
|
|
/* These strings *must* follow the same order as the enum ORTE_PLM_RSH_SHELL_* */
|
|
|
|
static const char *orte_plm_rsh_shell_name[7] = {
|
|
|
|
"bash",
|
|
|
|
"zsh",
|
|
|
|
"tcsh", /* tcsh has to be first otherwise strstr finds csh */
|
|
|
|
"csh",
|
|
|
|
"ksh",
|
|
|
|
"sh",
|
|
|
|
"unknown"
|
2008-02-28 01:57:57 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Local functions
|
|
|
|
*/
|
|
|
|
static void set_handler_default(int sig);
|
|
|
|
static orte_plm_rsh_shell_t find_shell(char *shell);
|
2011-11-26 02:33:05 +00:00
|
|
|
static int launch_agent_setup(const char *agent, char *path);
|
|
|
|
static void ssh_child(int argc, char **argv,
|
|
|
|
orte_vpid_t vpid, int proc_vpid_index)
|
|
|
|
__opal_attribute_noreturn__;
|
|
|
|
static int rsh_probe(char *nodename,
|
|
|
|
orte_plm_rsh_shell_t *shell);
|
|
|
|
static int setup_shell(orte_plm_rsh_shell_t *rshell,
|
|
|
|
orte_plm_rsh_shell_t *lshell,
|
|
|
|
char *nodename, int *argc, char ***argv);
|
2008-02-28 01:57:57 +00:00
|
|
|
|
|
|
|
/* local global storage of timing variables */
|
|
|
|
static struct timeval joblaunchstart, joblaunchstop;
|
|
|
|
|
2008-04-14 18:26:08 +00:00
|
|
|
/* local global storage */
|
2011-11-26 02:33:05 +00:00
|
|
|
static char *rsh_agent_path=NULL;
|
|
|
|
static char **rsh_agent_argv=NULL;
|
|
|
|
static opal_list_t my_children;
|
|
|
|
static size_t num_children, num_active=0;
|
|
|
|
static orte_vpid_t my_parent;
|
2008-02-28 01:57:57 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Init the module
|
|
|
|
*/
|
2011-11-26 02:33:05 +00:00
|
|
|
static int rsh_init(void)
|
2008-02-28 01:57:57 +00:00
|
|
|
{
|
2011-03-22 02:23:09 +00:00
|
|
|
char *tmp;
|
2008-02-28 01:57:57 +00:00
|
|
|
int rc;
|
|
|
|
|
2011-03-22 02:23:09 +00:00
|
|
|
/* we were selected, so setup the launch agent */
|
|
|
|
if (mca_plm_rsh_component.using_qrsh) {
|
|
|
|
/* perform base setup for qrsh */
|
|
|
|
asprintf(&tmp, "%s/bin/%s", getenv("SGE_ROOT"), getenv("ARC"));
|
2011-11-26 02:33:05 +00:00
|
|
|
if (ORTE_SUCCESS != (rc = launch_agent_setup("qrsh", tmp))) {
|
2011-03-22 02:23:09 +00:00
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
free(tmp);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
free(tmp);
|
|
|
|
/* automatically add -inherit and grid engine PE related flags */
|
2011-11-26 02:33:05 +00:00
|
|
|
opal_argv_append_nosize(&rsh_agent_argv, "-inherit");
|
2011-03-22 02:23:09 +00:00
|
|
|
/* Don't use the "-noshell" flag as qrsh would have a problem
|
|
|
|
* swallowing a long command */
|
2011-11-26 02:33:05 +00:00
|
|
|
opal_argv_append_nosize(&rsh_agent_argv, "-nostdin");
|
|
|
|
opal_argv_append_nosize(&rsh_agent_argv, "-V");
|
2011-03-22 02:23:09 +00:00
|
|
|
if (0 < opal_output_get_verbosity(orte_plm_globals.output)) {
|
2011-11-26 02:33:05 +00:00
|
|
|
opal_argv_append_nosize(&rsh_agent_argv, "-verbose");
|
|
|
|
tmp = opal_argv_join(rsh_agent_argv, ' ');
|
2011-03-22 02:23:09 +00:00
|
|
|
opal_output_verbose(1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: using \"%s\" for launching\n",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), tmp);
|
|
|
|
free(tmp);
|
|
|
|
}
|
2011-03-29 07:46:59 +00:00
|
|
|
} else if(mca_plm_rsh_component.using_llspawn) {
|
|
|
|
/* perform base setup for llspawn */
|
2011-11-26 02:33:05 +00:00
|
|
|
if (ORTE_SUCCESS != (rc = launch_agent_setup("llspawn", NULL))) {
|
2011-03-29 07:46:59 +00:00
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
opal_output_verbose(1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: using \"%s\" for launching\n",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
2011-11-26 02:33:05 +00:00
|
|
|
rsh_agent_path);
|
2011-03-22 02:23:09 +00:00
|
|
|
} else {
|
2011-03-29 07:46:59 +00:00
|
|
|
/* not using qrsh or llspawn - use MCA-specified agent */
|
2011-11-26 02:33:05 +00:00
|
|
|
if (ORTE_SUCCESS != (rc = launch_agent_setup(mca_plm_rsh_component.agent, NULL))) {
|
2011-03-22 02:23:09 +00:00
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-28 01:57:57 +00:00
|
|
|
if (ORTE_SUCCESS != (rc = orte_plm_base_comm_start())) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
}
|
2009-02-09 20:44:44 +00:00
|
|
|
|
2011-11-26 02:33:05 +00:00
|
|
|
/* initialize the children tree */
|
|
|
|
OBJ_CONSTRUCT(&my_children, opal_list_t);
|
|
|
|
num_children = 0;
|
2008-02-28 01:57:57 +00:00
|
|
|
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
/* we assign daemon nodes at launch */
|
|
|
|
orte_plm_globals.daemon_nodes_assigned_at_launch = true;
|
|
|
|
|
2008-02-28 01:57:57 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Callback on daemon exit.
|
|
|
|
*/
|
2011-11-26 02:33:05 +00:00
|
|
|
static void rsh_wait_daemon(pid_t pid, int status, void* cbdata)
|
2008-02-28 01:57:57 +00:00
|
|
|
{
|
2008-04-14 18:26:08 +00:00
|
|
|
orte_std_cntr_t cnt=1;
|
|
|
|
uint8_t flag;
|
2008-10-16 14:21:37 +00:00
|
|
|
orte_job_t *jdata;
|
2008-02-28 01:57:57 +00:00
|
|
|
|
2008-02-28 19:58:32 +00:00
|
|
|
if (! WIFEXITED(status) || ! WEXITSTATUS(status) == 0) { /* if abnormal exit */
|
2008-04-14 18:26:08 +00:00
|
|
|
/* if we are not the HNP, send a message to the HNP alerting it
|
|
|
|
* to the failure
|
|
|
|
*/
|
2009-05-04 11:07:40 +00:00
|
|
|
if (!ORTE_PROC_IS_HNP) {
|
2008-04-14 18:26:08 +00:00
|
|
|
opal_buffer_t buf;
|
|
|
|
orte_vpid_t *vpid=(orte_vpid_t*)cbdata;
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-04-14 18:26:08 +00:00
|
|
|
"%s daemon %d failed with status %d",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
2008-04-14 18:26:08 +00:00
|
|
|
(int)*vpid, WEXITSTATUS(status)));
|
|
|
|
OBJ_CONSTRUCT(&buf, opal_buffer_t);
|
|
|
|
opal_dss.pack(&buf, &cnt, 1, ORTE_STD_CNTR);
|
|
|
|
flag = 1;
|
|
|
|
opal_dss.pack(&buf, &flag, 1, OPAL_UINT8);
|
|
|
|
opal_dss.pack(&buf, vpid, 1, ORTE_VPID);
|
|
|
|
orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buf, ORTE_RML_TAG_REPORT_REMOTE_LAUNCH, 0);
|
|
|
|
OBJ_DESTRUCT(&buf);
|
|
|
|
} else {
|
|
|
|
orte_proc_t *daemon=(orte_proc_t*)cbdata;
|
2008-10-16 14:21:37 +00:00
|
|
|
jdata = orte_get_job_data_object(ORTE_PROC_MY_NAME->jobid);
|
|
|
|
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-04-14 18:26:08 +00:00
|
|
|
"%s daemon %d failed with status %d",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
2008-04-14 18:26:08 +00:00
|
|
|
(int)daemon->name.vpid, WEXITSTATUS(status)));
|
|
|
|
/* note that this daemon failed */
|
|
|
|
daemon->state = ORTE_PROC_STATE_FAILED_TO_START;
|
2008-10-16 14:21:37 +00:00
|
|
|
/* increment the #daemons terminated so we will exit properly */
|
|
|
|
jdata->num_terminated++;
|
2008-04-14 18:26:08 +00:00
|
|
|
/* report that the daemon has failed so we can exit */
|
2010-04-23 04:44:41 +00:00
|
|
|
orte_errmgr.update_state(ORTE_PROC_MY_NAME->jobid, ORTE_JOB_STATE_FAILED_TO_START,
|
2011-10-25 19:09:52 +00:00
|
|
|
NULL, ORTE_PROC_STATE_UNDEF, pid, status);
|
2008-04-14 18:26:08 +00:00
|
|
|
}
|
2008-02-28 19:58:32 +00:00
|
|
|
}
|
2008-02-28 01:57:57 +00:00
|
|
|
|
|
|
|
/* release any waiting threads */
|
|
|
|
OPAL_THREAD_LOCK(&mca_plm_rsh_component.lock);
|
|
|
|
|
2011-11-26 02:33:05 +00:00
|
|
|
if (num_active-- >= mca_plm_rsh_component.num_concurrent ||
|
|
|
|
num_active == 0) {
|
2008-02-28 01:57:57 +00:00
|
|
|
opal_condition_signal(&mca_plm_rsh_component.cond);
|
|
|
|
}
|
|
|
|
|
|
|
|
OPAL_THREAD_UNLOCK(&mca_plm_rsh_component.lock);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-02-09 20:44:44 +00:00
|
|
|
static int setup_launch(int *argcptr, char ***argvptr,
|
|
|
|
char *nodename,
|
|
|
|
int *node_name_index1,
|
|
|
|
int *proc_vpid_index, char *prefix_dir)
|
|
|
|
{
|
|
|
|
int argc;
|
|
|
|
char **argv;
|
2011-12-07 01:24:36 +00:00
|
|
|
char *param, *value;
|
2009-02-09 20:44:44 +00:00
|
|
|
orte_plm_rsh_shell_t remote_shell, local_shell;
|
|
|
|
char *lib_base, *bin_base;
|
|
|
|
int orted_argc;
|
|
|
|
char **orted_argv;
|
|
|
|
char *orted_cmd, *orted_prefix, *final_cmd;
|
|
|
|
int orted_index;
|
|
|
|
int rc;
|
2011-12-07 01:24:36 +00:00
|
|
|
int cnt, i, j;
|
|
|
|
bool found;
|
2009-02-09 20:44:44 +00:00
|
|
|
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
/* Figure out the basenames for the libdir and bindir. This
|
2011-12-07 01:24:36 +00:00
|
|
|
requires some explanation:
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
|
2011-12-07 01:24:36 +00:00
|
|
|
- Use opal_install_dirs.libdir and opal_install_dirs.bindir.
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
|
2011-12-07 01:24:36 +00:00
|
|
|
- After a discussion on the devel-core mailing list, the
|
|
|
|
developers decided that we should use the local directory
|
|
|
|
basenames as the basis for the prefix on the remote note.
|
|
|
|
This does not handle a few notable cases (e.g., if the
|
|
|
|
libdir/bindir is not simply a subdir under the prefix, if the
|
|
|
|
libdir/bindir basename is not the same on the remote node as
|
|
|
|
it is here on the local node, etc.), but we decided that
|
|
|
|
--prefix was meant to handle "the common case". If you need
|
|
|
|
something more complex than this, a) edit your shell startup
|
|
|
|
files to set PATH/LD_LIBRARY_PATH properly on the remove
|
|
|
|
node, or b) use some new/to-be-defined options that
|
|
|
|
explicitly allow setting the bindir/libdir on the remote
|
|
|
|
node. We decided to implement these options (e.g.,
|
|
|
|
--remote-bindir and --remote-libdir) to orterun when it
|
|
|
|
actually becomes a problem for someone (vs. a hypothetical
|
|
|
|
situation).
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
|
2011-12-07 01:24:36 +00:00
|
|
|
Hence, for now, we simply take the basename of this install's
|
|
|
|
libdir and bindir and use it to append this install's prefix
|
|
|
|
and use that on the remote node.
|
|
|
|
*/
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
|
|
|
|
lib_base = opal_basename(opal_install_dirs.libdir);
|
|
|
|
bin_base = opal_basename(opal_install_dirs.bindir);
|
|
|
|
|
2008-04-14 18:26:08 +00:00
|
|
|
/*
|
|
|
|
* Build argv array
|
|
|
|
*/
|
2011-11-26 02:33:05 +00:00
|
|
|
argv = opal_argv_copy(rsh_agent_argv);
|
|
|
|
argc = opal_argv_count(rsh_agent_argv);
|
2008-04-14 18:26:08 +00:00
|
|
|
*node_name_index1 = argc;
|
|
|
|
opal_argv_append(&argc, &argv, "<template>");
|
|
|
|
|
2009-02-09 20:44:44 +00:00
|
|
|
/* setup the correct shell info */
|
|
|
|
if (ORTE_SUCCESS != (rc = setup_shell(&remote_shell, &local_shell,
|
|
|
|
nodename, &argc, &argv))) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
return rc;
|
2008-10-08 14:21:42 +00:00
|
|
|
}
|
|
|
|
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
/* now get the orted cmd - as specified by user - into our tmp array.
|
|
|
|
* The function returns the location where the actual orted command is
|
|
|
|
* located - usually in the final spot, but someone could
|
|
|
|
* have added options. For example, it should be legal for them to use
|
|
|
|
* "orted --debug-devel" so they get debug output from the orteds, but
|
|
|
|
* not from mpirun. Also, they may have a customized version of orted
|
|
|
|
* that takes arguments in addition to the std ones we already support
|
|
|
|
*/
|
|
|
|
orted_argc = 0;
|
|
|
|
orted_argv = NULL;
|
|
|
|
orted_index = orte_plm_base_setup_orted_cmd(&orted_argc, &orted_argv);
|
|
|
|
|
|
|
|
/* look at the returned orted cmd argv to check several cases:
|
|
|
|
*
|
|
|
|
* - only "orted" was given. This is the default and thus most common
|
|
|
|
* case. In this situation, there is nothing we need to do
|
|
|
|
*
|
|
|
|
* - something was given that doesn't include "orted" - i.e., someone
|
|
|
|
* has substituted their own daemon. There isn't anything we can
|
|
|
|
* do here, so we want to avoid adding prefixes to the cmd
|
|
|
|
*
|
|
|
|
* - something was given that precedes "orted". For example, someone
|
|
|
|
* may have specified "valgrind [options] orted". In this case, we
|
|
|
|
* need to separate out that "orted_prefix" section so it can be
|
|
|
|
* treated separately below
|
|
|
|
*
|
|
|
|
* - something was given that follows "orted". An example was given above.
|
|
|
|
* In this case, we need to construct the effective "orted_cmd" so it
|
|
|
|
* can be treated properly below
|
|
|
|
*
|
|
|
|
* Obviously, the latter two cases can be combined - just to make it
|
|
|
|
* even more interesting! Gotta love rsh/ssh...
|
|
|
|
*/
|
|
|
|
if (0 == orted_index) {
|
2009-08-18 14:57:34 +00:00
|
|
|
/* single word cmd - this is the default scenario, but there could
|
|
|
|
* be options specified so we need to account for that possibility.
|
|
|
|
* However, we don't need/want a prefix as nothing precedes the orted
|
|
|
|
* cmd itself
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
*/
|
|
|
|
orted_cmd = opal_argv_join(orted_argv, ' ');
|
|
|
|
orted_prefix = NULL;
|
|
|
|
} else {
|
|
|
|
/* okay, so the "orted" cmd is somewhere in this array, with
|
|
|
|
* something preceding it and perhaps things following it.
|
|
|
|
*/
|
|
|
|
orted_prefix = opal_argv_join_range(orted_argv, 0, orted_index, ' ');
|
|
|
|
orted_cmd = opal_argv_join_range(orted_argv, orted_index, opal_argv_count(orted_argv), ' ');
|
|
|
|
}
|
|
|
|
opal_argv_free(orted_argv); /* done with this */
|
|
|
|
|
|
|
|
/* we now need to assemble the actual cmd that will be executed - this depends
|
|
|
|
* upon whether or not a prefix directory is being used
|
|
|
|
*/
|
|
|
|
if (NULL != prefix_dir) {
|
|
|
|
/* if we have a prefix directory, we need to set the PATH and
|
|
|
|
* LD_LIBRARY_PATH on the remote node, and prepend just the orted_cmd
|
|
|
|
* with the prefix directory
|
|
|
|
*/
|
|
|
|
char *opal_prefix = getenv("OPAL_PREFIX");
|
2009-06-24 23:57:32 +00:00
|
|
|
char* full_orted_cmd = NULL;
|
|
|
|
|
|
|
|
if( NULL != orted_cmd ) {
|
|
|
|
asprintf( &full_orted_cmd, "%s/%s/%s", prefix_dir, bin_base, orted_cmd );
|
|
|
|
}
|
|
|
|
|
2008-10-08 14:21:42 +00:00
|
|
|
if (ORTE_PLM_RSH_SHELL_SH == remote_shell ||
|
|
|
|
ORTE_PLM_RSH_SHELL_KSH == remote_shell ||
|
|
|
|
ORTE_PLM_RSH_SHELL_ZSH == remote_shell ||
|
|
|
|
ORTE_PLM_RSH_SHELL_BASH == remote_shell) {
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
/* if there is nothing preceding orted, then we can just
|
|
|
|
* assemble the cmd with the orted_cmd at the end. Otherwise,
|
|
|
|
* we have to insert the orted_prefix in the right place
|
|
|
|
*/
|
|
|
|
asprintf (&final_cmd,
|
|
|
|
"%s%s%s PATH=%s/%s:$PATH ; export PATH ; "
|
|
|
|
"LD_LIBRARY_PATH=%s/%s:$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH ; "
|
2009-06-24 23:57:32 +00:00
|
|
|
"%s %s",
|
2009-08-18 14:57:34 +00:00
|
|
|
(opal_prefix != NULL ? "OPAL_PREFIX=" : " "),
|
|
|
|
(opal_prefix != NULL ? opal_prefix : " "),
|
|
|
|
(opal_prefix != NULL ? " ; export OPAL_PREFIX;" : " "),
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
prefix_dir, bin_base,
|
|
|
|
prefix_dir, lib_base,
|
2009-08-18 14:57:34 +00:00
|
|
|
(orted_prefix != NULL ? orted_prefix : " "),
|
|
|
|
(full_orted_cmd != NULL ? full_orted_cmd : " "));
|
2008-10-08 14:21:42 +00:00
|
|
|
} else if (ORTE_PLM_RSH_SHELL_TCSH == remote_shell ||
|
|
|
|
ORTE_PLM_RSH_SHELL_CSH == remote_shell) {
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
/* [t]csh is a bit more challenging -- we
|
2011-12-07 01:24:36 +00:00
|
|
|
have to check whether LD_LIBRARY_PATH
|
|
|
|
is already set before we try to set it.
|
|
|
|
Must be very careful about obeying
|
|
|
|
[t]csh's order of evaluation and not
|
|
|
|
using a variable before it is defined.
|
|
|
|
See this thread for more details:
|
|
|
|
http://www.open-mpi.org/community/lists/users/2006/01/0517.php. */
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
/* if there is nothing preceding orted, then we can just
|
|
|
|
* assemble the cmd with the orted_cmd at the end. Otherwise,
|
|
|
|
* we have to insert the orted_prefix in the right place
|
|
|
|
*/
|
|
|
|
asprintf (&final_cmd,
|
|
|
|
"%s%s%s set path = ( %s/%s $path ) ; "
|
|
|
|
"if ( $?LD_LIBRARY_PATH == 1 ) "
|
|
|
|
"set OMPI_have_llp ; "
|
|
|
|
"if ( $?LD_LIBRARY_PATH == 0 ) "
|
|
|
|
"setenv LD_LIBRARY_PATH %s/%s ; "
|
|
|
|
"if ( $?OMPI_have_llp == 1 ) "
|
|
|
|
"setenv LD_LIBRARY_PATH %s/%s:$LD_LIBRARY_PATH ; "
|
2009-06-24 23:57:32 +00:00
|
|
|
"%s %s",
|
2009-08-18 14:57:34 +00:00
|
|
|
(opal_prefix != NULL ? "setenv OPAL_PREFIX " : " "),
|
|
|
|
(opal_prefix != NULL ? opal_prefix : " "),
|
|
|
|
(opal_prefix != NULL ? " ;" : " "),
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
prefix_dir, bin_base,
|
|
|
|
prefix_dir, lib_base,
|
|
|
|
prefix_dir, lib_base,
|
2009-08-18 14:57:34 +00:00
|
|
|
(orted_prefix != NULL ? orted_prefix : " "),
|
|
|
|
(full_orted_cmd != NULL ? full_orted_cmd : " "));
|
2008-09-10 01:59:49 +00:00
|
|
|
} else {
|
|
|
|
orte_show_help("help-plm-rsh.txt", "cannot-resolve-shell-with-prefix", true,
|
|
|
|
(NULL == opal_prefix) ? "NULL" : opal_prefix,
|
|
|
|
prefix_dir);
|
|
|
|
return ORTE_ERR_SILENT;
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
}
|
2009-06-24 23:57:32 +00:00
|
|
|
if( NULL != full_orted_cmd ) {
|
|
|
|
free(full_orted_cmd);
|
|
|
|
}
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
} else {
|
|
|
|
/* no prefix directory, so just aggregate the result */
|
|
|
|
asprintf(&final_cmd, "%s %s",
|
|
|
|
(orted_prefix != NULL ? orted_prefix : ""),
|
|
|
|
(orted_cmd != NULL ? orted_cmd : ""));
|
|
|
|
}
|
|
|
|
/* now add the final cmd to the argv array */
|
|
|
|
opal_argv_append(&argc, &argv, final_cmd);
|
|
|
|
free(final_cmd); /* done with this */
|
|
|
|
if (NULL != orted_prefix) free(orted_prefix);
|
|
|
|
if (NULL != orted_cmd) free(orted_cmd);
|
2008-04-14 18:26:08 +00:00
|
|
|
|
|
|
|
/* if we are not tree launching or debugging, tell the daemon
|
|
|
|
* to daemonize so we can launch the next group
|
|
|
|
*/
|
|
|
|
if (!mca_plm_rsh_component.tree_spawn &&
|
|
|
|
!orte_debug_flag &&
|
|
|
|
!orte_debug_daemons_flag &&
|
2008-08-14 18:59:01 +00:00
|
|
|
!orte_debug_daemons_file_flag &&
|
2009-02-18 18:02:38 +00:00
|
|
|
!orte_leave_session_attached &&
|
|
|
|
/* Daemonize when not using qrsh. Or, if using qrsh, only
|
|
|
|
* daemonize if told to by user with daemonize_qrsh flag. */
|
|
|
|
((!mca_plm_rsh_component.using_qrsh) ||
|
2011-12-07 01:24:36 +00:00
|
|
|
(mca_plm_rsh_component.using_qrsh && mca_plm_rsh_component.daemonize_qrsh)) &&
|
2011-03-29 07:46:59 +00:00
|
|
|
((!mca_plm_rsh_component.using_llspawn) ||
|
2011-12-07 01:24:36 +00:00
|
|
|
(mca_plm_rsh_component.using_llspawn && mca_plm_rsh_component.daemonize_llspawn))) {
|
2008-04-14 18:26:08 +00:00
|
|
|
opal_argv_append(&argc, &argv, "--daemonize");
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add the basic arguments to the orted command line, including
|
|
|
|
* all debug options
|
|
|
|
*/
|
|
|
|
orte_plm_base_orted_append_basic_args(&argc, &argv,
|
|
|
|
"env",
|
|
|
|
proc_vpid_index,
|
2010-05-05 00:48:43 +00:00
|
|
|
NULL);
|
2008-04-14 18:26:08 +00:00
|
|
|
|
2009-06-22 18:08:45 +00:00
|
|
|
/* ensure that only the ssh plm is selected on the remote daemon */
|
|
|
|
opal_argv_append_nosize(&argv, "-mca");
|
|
|
|
opal_argv_append_nosize(&argv, "plm");
|
|
|
|
opal_argv_append_nosize(&argv, "rsh");
|
|
|
|
|
2009-06-24 23:51:53 +00:00
|
|
|
/* in the rsh environment, we can append multi-word arguments
|
|
|
|
* by enclosing them in quotes. Check for any multi-word
|
|
|
|
* mca params passed to mpirun and include them
|
|
|
|
*/
|
2011-12-07 01:24:36 +00:00
|
|
|
cnt = opal_argv_count(orted_cmd_line);
|
|
|
|
for (i=0; i < cnt; i+=3) {
|
|
|
|
/* check if the specified option is more than one word - all
|
|
|
|
* others have already been passed
|
|
|
|
*/
|
|
|
|
if (NULL != strchr(orted_cmd_line[i+2], ' ')) {
|
|
|
|
/* must add quotes around it */
|
|
|
|
asprintf(¶m, "\"%s\"", orted_cmd_line[i+2]);
|
|
|
|
/* now pass it along */
|
|
|
|
opal_argv_append(&argc, &argv, orted_cmd_line[i]);
|
|
|
|
opal_argv_append(&argc, &argv, orted_cmd_line[i+1]);
|
|
|
|
opal_argv_append(&argc, &argv, param);
|
|
|
|
free(param);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* unless told otherwise... */
|
|
|
|
if (mca_plm_rsh_component.pass_environ_mca_params) {
|
|
|
|
/* now check our local environment for MCA params - add them
|
|
|
|
* only if they aren't already present
|
|
|
|
*/
|
|
|
|
for (i = 0; NULL != environ[i]; ++i) {
|
|
|
|
if (0 == strncmp("OMPI_", environ[i], 5)) {
|
|
|
|
/* check for duplicate in app->env - this
|
|
|
|
* would have been placed there by the
|
|
|
|
* cmd line processor. By convention, we
|
|
|
|
* always let the cmd line override the
|
|
|
|
* environment
|
|
|
|
*/
|
|
|
|
param = strdup(&environ[i][9]);
|
|
|
|
value = strchr(param, '=');
|
|
|
|
*value = '\0';
|
|
|
|
value++;
|
|
|
|
/* see if this param exists on the cmd line */
|
|
|
|
for (j=0; NULL != argv[j]; j++) {
|
|
|
|
if (0 == strcmp(param, argv[j])) {
|
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!found) {
|
|
|
|
/* add it */
|
|
|
|
opal_argv_append(&argc, &argv, "-mca");
|
|
|
|
opal_argv_append(&argc, &argv, param);
|
|
|
|
opal_argv_append(&argc, &argv, value);
|
|
|
|
}
|
2009-06-24 23:51:53 +00:00
|
|
|
free(param);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-12-07 01:24:36 +00:00
|
|
|
value = opal_argv_join(argv, ' ');
|
2011-12-08 16:35:41 +00:00
|
|
|
if (sysconf(_SC_ARG_MAX) < (int)strlen(value)) {
|
2011-12-07 01:24:36 +00:00
|
|
|
orte_show_help("help-plm-rsh.txt", "cmd-line-too-long",
|
2011-12-08 16:13:58 +00:00
|
|
|
true, strlen(value), sysconf(_SC_ARG_MAX));
|
2011-12-07 01:24:36 +00:00
|
|
|
free(value);
|
|
|
|
return ORTE_ERR_SILENT;
|
|
|
|
}
|
|
|
|
free(value);
|
|
|
|
|
2008-10-17 16:03:17 +00:00
|
|
|
if (ORTE_PLM_RSH_SHELL_SH == remote_shell ||
|
|
|
|
ORTE_PLM_RSH_SHELL_KSH == remote_shell) {
|
|
|
|
opal_argv_append(&argc, &argv, ")");
|
|
|
|
}
|
|
|
|
|
2008-06-09 14:53:58 +00:00
|
|
|
if (0 < opal_output_get_verbosity(orte_plm_globals.output)) {
|
2008-04-14 18:26:08 +00:00
|
|
|
param = opal_argv_join(argv, ' ');
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-04-14 18:26:08 +00:00
|
|
|
"%s plm:rsh: final template argv:\n\t%s",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
2008-04-14 18:26:08 +00:00
|
|
|
(NULL == param) ? "NULL" : param));
|
|
|
|
if (NULL != param) free(param);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* all done */
|
|
|
|
*argcptr = argc;
|
|
|
|
*argvptr = argv;
|
|
|
|
return ORTE_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* actually ssh the child */
|
|
|
|
static void ssh_child(int argc, char **argv,
|
2008-10-08 14:21:42 +00:00
|
|
|
orte_vpid_t vpid, int proc_vpid_index)
|
2008-04-14 18:26:08 +00:00
|
|
|
{
|
|
|
|
char** env;
|
|
|
|
char* var;
|
|
|
|
long fd, fdmax = sysconf(_SC_OPEN_MAX);
|
|
|
|
int rc;
|
|
|
|
char *exec_path;
|
|
|
|
char **exec_argv;
|
|
|
|
int fdin;
|
|
|
|
sigset_t sigs;
|
|
|
|
|
|
|
|
/* setup environment */
|
2008-06-23 22:39:36 +00:00
|
|
|
env = opal_argv_copy(orte_launch_environ);
|
2008-04-14 18:26:08 +00:00
|
|
|
|
|
|
|
/* We don't need to sense an oversubscribed condition and set the sched_yield
|
|
|
|
* for the node as we are only launching the daemons at this time. The daemons
|
|
|
|
* are now smart enough to set the oversubscribed condition themselves when
|
|
|
|
* they launch the local procs.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* We cannot launch locally as this would cause multiple daemons to
|
|
|
|
* exist on a node (HNP counts as a daemon). This is taken care of
|
|
|
|
* by the earlier check for daemon_preexists, so we only have to worry
|
|
|
|
* about remote launches here
|
|
|
|
*/
|
|
|
|
exec_argv = argv;
|
2011-11-26 02:33:05 +00:00
|
|
|
exec_path = strdup(rsh_agent_path);
|
2008-04-14 18:26:08 +00:00
|
|
|
|
|
|
|
/* pass the vpid */
|
|
|
|
rc = orte_util_convert_vpid_to_string(&var, vpid);
|
|
|
|
if (ORTE_SUCCESS != rc) {
|
2008-06-09 14:53:58 +00:00
|
|
|
opal_output(0, "orte_plm_rsh: unable to get daemon vpid as string");
|
2008-04-14 18:26:08 +00:00
|
|
|
exit(-1);
|
|
|
|
}
|
|
|
|
free(argv[proc_vpid_index]);
|
|
|
|
argv[proc_vpid_index] = strdup(var);
|
|
|
|
free(var);
|
|
|
|
|
2009-03-16 19:12:48 +00:00
|
|
|
/* Don't let ssh slurp all of our stdin! */
|
|
|
|
fdin = open("/dev/null", O_RDWR);
|
|
|
|
dup2(fdin, 0);
|
|
|
|
close(fdin);
|
2008-04-14 18:26:08 +00:00
|
|
|
|
|
|
|
/* close all file descriptors w/ exception of stdin/stdout/stderr */
|
|
|
|
for(fd=3; fd<fdmax; fd++)
|
|
|
|
close(fd);
|
|
|
|
|
|
|
|
/* Set signal handlers back to the default. Do this close
|
|
|
|
to the execve() because the event library may (and likely
|
|
|
|
will) reset them. If we don't do this, the event
|
|
|
|
library may have left some set that, at least on some
|
|
|
|
OS's, don't get reset via fork() or exec(). Hence, the
|
|
|
|
orted could be unkillable (for example). */
|
|
|
|
|
|
|
|
set_handler_default(SIGTERM);
|
|
|
|
set_handler_default(SIGINT);
|
|
|
|
set_handler_default(SIGHUP);
|
|
|
|
set_handler_default(SIGPIPE);
|
|
|
|
set_handler_default(SIGCHLD);
|
|
|
|
|
|
|
|
/* Unblock all signals, for many of the same reasons that
|
|
|
|
we set the default handlers, above. This is noticable
|
|
|
|
on Linux where the event library blocks SIGTERM, but we
|
|
|
|
don't want that blocked by the orted (or, more
|
|
|
|
specifically, we don't want it to be blocked by the
|
|
|
|
orted and then inherited by the ORTE processes that it
|
|
|
|
forks, making them unkillable by SIGTERM). */
|
|
|
|
sigprocmask(0, 0, &sigs);
|
|
|
|
sigprocmask(SIG_UNBLOCK, &sigs, 0);
|
|
|
|
|
|
|
|
/* exec the daemon */
|
|
|
|
var = opal_argv_join(argv, ' ');
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-04-14 18:26:08 +00:00
|
|
|
"%s plm:rsh: executing: (%s) [%s]",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
2008-04-14 18:26:08 +00:00
|
|
|
exec_path, (NULL == var) ? "NULL" : var));
|
|
|
|
if (NULL != var) free(var);
|
|
|
|
|
|
|
|
execve(exec_path, exec_argv, env);
|
2008-06-09 14:53:58 +00:00
|
|
|
opal_output(0, "plm:rsh: execv of %s failed with errno=%s(%d)\n",
|
2008-04-14 18:26:08 +00:00
|
|
|
exec_path, strerror(errno), errno);
|
|
|
|
exit(-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* launch a set of daemons from a remote daemon
|
|
|
|
*/
|
|
|
|
static int remote_spawn(opal_buffer_t *launch)
|
|
|
|
{
|
|
|
|
opal_list_item_t *item;
|
|
|
|
int node_name_index1;
|
|
|
|
int proc_vpid_index;
|
|
|
|
char **argv = NULL;
|
2008-10-31 21:10:00 +00:00
|
|
|
char *prefix, *hostname;
|
2008-04-14 18:26:08 +00:00
|
|
|
int argc;
|
|
|
|
int rc;
|
|
|
|
bool failed_launch = true;
|
|
|
|
pid_t pid;
|
2008-04-24 18:38:24 +00:00
|
|
|
orte_std_cntr_t n;
|
2008-10-31 21:10:00 +00:00
|
|
|
opal_byte_object_t *bo;
|
2011-11-28 22:24:49 +00:00
|
|
|
orte_process_name_t target;
|
2008-04-24 18:38:24 +00:00
|
|
|
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-04-30 19:49:53 +00:00
|
|
|
"%s plm:rsh: remote spawn called",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
|
2008-04-14 18:26:08 +00:00
|
|
|
|
2008-04-24 18:53:08 +00:00
|
|
|
/* extract the prefix from the launch buffer */
|
|
|
|
n = 1;
|
|
|
|
if (ORTE_SUCCESS != (rc = opal_dss.unpack(launch, &prefix, &n, OPAL_STRING))) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
2008-04-30 19:49:53 +00:00
|
|
|
goto cleanup;
|
2008-04-24 18:53:08 +00:00
|
|
|
}
|
|
|
|
|
2008-10-31 21:10:00 +00:00
|
|
|
/* extract the byte object holding the nidmap */
|
|
|
|
n=1;
|
|
|
|
if (ORTE_SUCCESS != (rc = opal_dss.unpack(launch, &bo, &n, OPAL_BYTE_OBJECT))) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
/* update our nidmap - this will free data in the byte object */
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_ess.update_nidmap(bo))) {
|
2008-04-30 19:49:53 +00:00
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2011-11-26 02:33:05 +00:00
|
|
|
/* ensure the routing tree is updated */
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_routed.update_routing_tree(ORTE_PROC_MY_NAME->jobid))) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2008-04-14 18:26:08 +00:00
|
|
|
/* clear out any previous child info */
|
2011-11-26 02:33:05 +00:00
|
|
|
while (NULL != (item = opal_list_remove_first(&my_children))) {
|
2008-04-14 18:26:08 +00:00
|
|
|
OBJ_RELEASE(item);
|
|
|
|
}
|
2011-11-26 02:33:05 +00:00
|
|
|
|
|
|
|
/* get the updated routing tree */
|
|
|
|
my_parent = orte_routed.get_routing_tree(&my_children);
|
|
|
|
num_children = opal_list_get_size(&my_children);
|
|
|
|
|
2008-04-14 18:26:08 +00:00
|
|
|
/* if I have no children, just return */
|
2011-11-26 02:33:05 +00:00
|
|
|
if (0 == num_children) {
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-04-14 18:26:08 +00:00
|
|
|
"%s plm:rsh: remote spawn - have no children!",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
|
2008-04-30 19:49:53 +00:00
|
|
|
failed_launch = false;
|
|
|
|
rc = ORTE_SUCCESS;
|
|
|
|
goto cleanup;
|
2008-04-14 18:26:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* setup the launch */
|
2009-03-05 21:56:03 +00:00
|
|
|
if (ORTE_SUCCESS != (rc = setup_launch(&argc, &argv, orte_process_info.nodename, &node_name_index1,
|
2008-10-08 14:21:42 +00:00
|
|
|
&proc_vpid_index, prefix))) {
|
2008-04-14 18:26:08 +00:00
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2011-11-28 22:24:49 +00:00
|
|
|
target.jobid = ORTE_PROC_MY_NAME->jobid;
|
2011-11-26 02:33:05 +00:00
|
|
|
for (item = opal_list_get_first(&my_children);
|
|
|
|
item != opal_list_get_end(&my_children);
|
2008-04-14 18:26:08 +00:00
|
|
|
item = opal_list_get_next(item)) {
|
2011-11-28 22:24:49 +00:00
|
|
|
orte_routed_tree_t *child = (orte_routed_tree_t*)item;
|
|
|
|
target.vpid = child->vpid;
|
2008-04-14 18:26:08 +00:00
|
|
|
|
2008-10-31 21:10:00 +00:00
|
|
|
/* get the host where this daemon resides */
|
2011-11-28 22:24:49 +00:00
|
|
|
if (NULL == (hostname = orte_ess.proc_get_hostname(&target))) {
|
2008-10-31 21:10:00 +00:00
|
|
|
opal_output(0, "%s unable to get hostname for daemon %s",
|
2011-11-28 22:24:49 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_VPID_PRINT(child->vpid));
|
2008-04-30 19:49:53 +00:00
|
|
|
rc = ORTE_ERR_NOT_FOUND;
|
2008-04-14 18:26:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
free(argv[node_name_index1]);
|
2008-10-31 21:10:00 +00:00
|
|
|
argv[node_name_index1] = strdup(hostname);
|
2008-04-14 18:26:08 +00:00
|
|
|
|
|
|
|
/* fork a child to exec the rsh/ssh session */
|
|
|
|
pid = fork();
|
|
|
|
if (pid < 0) {
|
|
|
|
ORTE_ERROR_LOG(ORTE_ERR_SYS_LIMITS_CHILDREN);
|
|
|
|
rc = ORTE_ERR_SYS_LIMITS_CHILDREN;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* child */
|
|
|
|
if (pid == 0) {
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-04-14 18:26:08 +00:00
|
|
|
"%s plm:rsh: launching on node %s",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
2008-10-31 21:10:00 +00:00
|
|
|
hostname));
|
2008-04-14 18:26:08 +00:00
|
|
|
|
|
|
|
/* do the ssh launch - this will exit if it fails */
|
2011-11-28 22:24:49 +00:00
|
|
|
ssh_child(argc, argv, child->vpid, proc_vpid_index);
|
2008-04-14 18:26:08 +00:00
|
|
|
|
|
|
|
}
|
2009-03-14 23:11:24 +00:00
|
|
|
/* father */
|
|
|
|
OPAL_THREAD_LOCK(&mca_plm_rsh_component.lock);
|
|
|
|
/* This situation can lead to a deadlock if '--debug-daemons' is set.
|
|
|
|
* However, the deadlock condition is tested at the begining of this
|
|
|
|
* function, so we're quite confident it should not happens here.
|
|
|
|
*/
|
2011-11-26 02:33:05 +00:00
|
|
|
if (num_active++ >= mca_plm_rsh_component.num_concurrent) {
|
2009-03-14 23:11:24 +00:00
|
|
|
opal_condition_wait(&mca_plm_rsh_component.cond, &mca_plm_rsh_component.lock);
|
|
|
|
}
|
|
|
|
OPAL_THREAD_UNLOCK(&mca_plm_rsh_component.lock);
|
|
|
|
|
|
|
|
/* setup callback on sigchild - wait until setup above is complete
|
|
|
|
* as the callback can occur in the call to orte_wait_cb
|
|
|
|
*/
|
2011-11-28 22:24:49 +00:00
|
|
|
orte_wait_cb(pid, rsh_wait_daemon, (void*)&child->vpid);
|
2008-04-14 18:26:08 +00:00
|
|
|
}
|
2008-05-01 19:19:34 +00:00
|
|
|
|
2008-04-14 18:26:08 +00:00
|
|
|
failed_launch = false;
|
|
|
|
|
Per the July technical meeting:
Standardize the handling of the orte launch agent option across PLMs. This has been a consistent complaint I have received - each PLM would register its own MCA param to get input on the launch agent for remote nodes (in fact, one or two didn't, but most did). This would then get handled in various and contradictory ways.
Some PLMs would accept only a one-word input. Others accepted multi-word args such as "valgrind orted", but then some would error by putting any prefix specified on the cmd line in front of the incorrect argument.
For example, while using the rsh launcher, if you specified "valgrind orted" as your launch agent and had "--prefix foo" on you cmd line, you would attempt to execute "ssh foo/valgrind orted" - which obviously wouldn't work.
This was all -very- confusing to users, who had to know which PLM was being used so they could even set the right mca param in the first place! And since we don't warn about non-recognized or non-used mca params, half of the time they would wind up not doing what they thought they were telling us to do.
To solve this problem, we did the following:
1. removed all mca params from the individual plms for the launch agent
2. added a new mca param "orte_launch_agent" for this purpose. To further simplify for users, this comes with a new cmd line option "--launch-agent" that can take a multi-word string argument. The value of the param defaults to "orted".
3. added a PLM base function that processes the orte_launch_agent value and adds the contents to a provided argv array. This can subsequently be harvested at-will to handle multi-word values
4. modified the PLMs to use this new function. All the PLMs except for the rsh PLM required very minor change - just called the function and moved on. The rsh PLM required much larger changes as - because of the rsh/ssh cmd line limitations - we had to correctly prepend any provided prefix to the correct argv entry.
5. added a new opal_argv_join_range function that allows the caller to "join" argv entries between two specified indices
Please let me know of any problems. I tried to make this as clean as possible, but cannot compile all PLMs to ensure all is correct.
This commit was SVN r19097.
2008-07-30 18:26:24 +00:00
|
|
|
cleanup:
|
2008-04-14 18:26:08 +00:00
|
|
|
if (NULL != argv) {
|
|
|
|
opal_argv_free(argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check for failed launch */
|
|
|
|
if (failed_launch) {
|
|
|
|
/* report cannot launch this daemon to HNP */
|
|
|
|
opal_buffer_t buf;
|
|
|
|
orte_std_cntr_t cnt=1;
|
|
|
|
uint8_t flag=1;
|
|
|
|
OBJ_CONSTRUCT(&buf, opal_buffer_t);
|
|
|
|
opal_dss.pack(&buf, &cnt, 1, ORTE_STD_CNTR);
|
|
|
|
opal_dss.pack(&buf, &flag, 1, OPAL_UINT8);
|
2011-11-28 22:24:49 +00:00
|
|
|
opal_dss.pack(&buf, &target.vpid, 1, ORTE_VPID);
|
2008-04-14 18:26:08 +00:00
|
|
|
orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buf, ORTE_RML_TAG_REPORT_REMOTE_LAUNCH, 0);
|
|
|
|
OBJ_DESTRUCT(&buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-11-26 02:33:05 +00:00
|
|
|
/**
|
|
|
|
* Launch a daemon (bootproxy) on each node. The daemon will be responsible
|
|
|
|
* for launching the application.
|
|
|
|
*/
|
2011-11-11 23:42:36 +00:00
|
|
|
|
2011-11-26 02:33:05 +00:00
|
|
|
/* When working in this function, ALWAYS jump to "cleanup" if
|
|
|
|
* you encounter an error so that orterun will be woken up and
|
|
|
|
* the job can cleanly terminate
|
|
|
|
*/
|
|
|
|
static int rsh_launch(orte_job_t *jdata)
|
2009-12-02 20:29:32 +00:00
|
|
|
{
|
2011-11-26 02:33:05 +00:00
|
|
|
orte_job_map_t *map = NULL;
|
|
|
|
int node_name_index1;
|
|
|
|
int proc_vpid_index;
|
|
|
|
char **argv = NULL;
|
|
|
|
char *prefix_dir;
|
|
|
|
int argc;
|
|
|
|
int rc;
|
|
|
|
bool failed_launch = true;
|
|
|
|
orte_app_context_t *app;
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
orte_node_t *node, *nd;
|
2011-11-26 02:33:05 +00:00
|
|
|
orte_std_cntr_t nnode;
|
|
|
|
orte_jobid_t failed_job;
|
|
|
|
orte_job_state_t job_state = ORTE_JOB_STATE_NEVER_LAUNCHED;
|
|
|
|
opal_list_item_t *item;
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
orte_job_t *daemons;
|
2009-12-02 20:29:32 +00:00
|
|
|
|
2009-07-20 01:51:29 +00:00
|
|
|
/* wait for the launch to complete */
|
|
|
|
OPAL_THREAD_LOCK(&orte_plm_globals.spawn_lock);
|
|
|
|
while (orte_plm_globals.spawn_in_progress) {
|
|
|
|
opal_condition_wait(&orte_plm_globals.spawn_in_progress_cond, &orte_plm_globals.spawn_lock);
|
|
|
|
}
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, "released to spawn"));
|
|
|
|
orte_plm_globals.spawn_in_progress = true;
|
|
|
|
orte_plm_globals.spawn_status = ORTE_ERR_FATAL;
|
2009-09-09 05:31:06 +00:00
|
|
|
OPAL_THREAD_UNLOCK(&orte_plm_globals.spawn_lock);
|
2009-07-20 01:51:29 +00:00
|
|
|
|
Fix a potential, albeit perhaps esoteric, race condition that can occur for fast HNP's, slow orteds, and fast apps. Under those conditions, it is possible for the orted to be caught in its original send of contact info back to the HNP, and thus for the progress stack never to recover back to a high level. In those circumstances, the orted can "hang" when trying to exit.
Add a new function to opal_progress that tells us our recursion depth to support that solution.
Yes, I know this sounds picky, but good ol' Jeff managed to make it happen by driving his cluster near to death...
Also ensure that we declare "failed" for the daemon job when daemons fail instead of the application job. This is important so that orte knows that it cannot use xcast to tell daemons to "exit", nor should it expect all daemons to respond. Otherwise, it is possible to hang.
After lots of testing, decide to default (again) to slurm detecting failed orteds. This proved necessary to avoid rather annoying hangs that were difficult to recover from. There are conditions where slurm will fail to launch all daemons (slurm folks are working on it), and yet again, good ol' Jeff managed to find both of them.
Thanks you Jeff! :-/
This commit was SVN r18611.
2008-06-06 19:36:27 +00:00
|
|
|
/* default to declaring the daemon launch as having failed */
|
|
|
|
failed_job = ORTE_PROC_MY_NAME->jobid;
|
2008-02-28 01:57:57 +00:00
|
|
|
|
2010-06-02 09:44:37 +00:00
|
|
|
/* if we are timing, record the start time */
|
2008-02-28 01:57:57 +00:00
|
|
|
if (orte_timing) {
|
2010-06-02 09:44:37 +00:00
|
|
|
gettimeofday(&orte_plm_globals.daemonlaunchstart, NULL);
|
|
|
|
joblaunchstart = orte_plm_globals.daemonlaunchstart;
|
2008-02-28 01:57:57 +00:00
|
|
|
}
|
|
|
|
|
2011-12-05 22:01:08 +00:00
|
|
|
/* setup the virtual machine */
|
|
|
|
daemons = orte_get_job_data_object(ORTE_PROC_MY_NAME->jobid);
|
2011-12-14 20:01:15 +00:00
|
|
|
if (ORTE_SUCCESS != (rc = orte_plm_base_setup_virtual_machine(jdata))) {
|
2011-12-05 22:01:08 +00:00
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
/* if we don't want to launch, then don't attempt to
|
|
|
|
* launch the daemons - the user really wants to just
|
|
|
|
* look at the proposed process map
|
|
|
|
*/
|
|
|
|
if (orte_do_not_launch) {
|
|
|
|
goto launch_apps;
|
|
|
|
}
|
|
|
|
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
"%s plm:rsh: launching vm",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
|
2008-02-28 01:57:57 +00:00
|
|
|
|
|
|
|
/* Get the map for this job */
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
if (NULL == (map = daemons->map)) {
|
2008-02-28 01:57:57 +00:00
|
|
|
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
|
|
|
|
rc = ORTE_ERR_NOT_FOUND;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (0 == map->num_new_daemons) {
|
|
|
|
/* have all the daemons we need - launch app */
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-02-28 01:57:57 +00:00
|
|
|
"%s plm:rsh: no new daemons to launch",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
|
2008-02-28 01:57:57 +00:00
|
|
|
goto launch_apps;
|
|
|
|
}
|
|
|
|
|
2008-08-14 18:59:01 +00:00
|
|
|
if ((0 < opal_output_get_verbosity(orte_plm_globals.output) ||
|
|
|
|
orte_leave_session_attached) &&
|
2011-11-26 02:33:05 +00:00
|
|
|
mca_plm_rsh_component.num_concurrent < (size_t)map->num_new_daemons) {
|
2008-02-28 01:57:57 +00:00
|
|
|
/**
|
2011-11-27 01:49:42 +00:00
|
|
|
* If we are in '--debug-daemons' we keep the ssh connection
|
2008-02-28 01:57:57 +00:00
|
|
|
* alive for the span of the run. If we use this option
|
|
|
|
* AND we launch on more than "num_concurrent" machines
|
|
|
|
* then we will deadlock. No connections are terminated
|
|
|
|
* until the job is complete, no job is started
|
|
|
|
* since all the orteds are waiting for all the others
|
|
|
|
* to come online, and the others ore not launched because
|
|
|
|
* we are waiting on those that have started to terminate
|
|
|
|
* their ssh tunnels. :(
|
|
|
|
* As we cannot run in this situation, pretty print the error
|
|
|
|
* and return an error code.
|
|
|
|
*/
|
This commit represents a bunch of work on a Mercurial side branch. As
such, the commit message back to the master SVN repository is fairly
long.
= ORTE Job-Level Output Messages =
Add two new interfaces that should be used for all new code throughout
the ORTE and OMPI layers (we already make the search-and-replace on
the existing ORTE / OMPI layers):
* orte_output(): (and corresponding friends ORTE_OUTPUT,
orte_output_verbose, etc.) This function sends the output directly
to the HNP for processing as part of a job-specific output
channel. It supports all the same outputs as opal_output()
(syslog, file, stdout, stderr), but for stdout/stderr, the output
is sent to the HNP for processing and output. More on this below.
* orte_show_help(): This function is a drop-in-replacement for
opal_show_help(), with two differences in functionality:
1. the rendered text help message output is sent to the HNP for
display (rather than outputting directly into the process' stderr
stream)
1. the HNP detects duplicate help messages and does not display them
(so that you don't see the same error message N times, once from
each of your N MPI processes); instead, it counts "new" instances
of the help message and displays a message every ~5 seconds when
there are new ones ("I got X new copies of the help message...")
opal_show_help and opal_output still exist, but they only output in
the current process. The intent for the new orte_* functions is that
they can apply job-level intelligence to the output. As such, we
recommend that all new ORTE and OMPI code use the new orte_*
functions, not thei opal_* functions.
=== New code ===
For ORTE and OMPI programmers, here's what you need to do differently
in new code:
* Do not include opal/util/show_help.h or opal/util/output.h.
Instead, include orte/util/output.h (this one header file has
declarations for both the orte_output() series of functions and
orte_show_help()).
* Effectively s/opal_output/orte_output/gi throughout your code.
Note that orte_output_open() takes a slightly different argument
list (as a way to pass data to the filtering stream -- see below),
so you if explicitly call opal_output_open(), you'll need to
slightly adapt to the new signature of orte_output_open().
* Literally s/opal_show_help/orte_show_help/. The function signature
is identical.
=== Notes ===
* orte_output'ing to stream 0 will do similar to what
opal_output'ing did, so leaving a hard-coded "0" as the first
argument is safe.
* For systems that do not use ORTE's RML or the HNP, the effect of
orte_output_* and orte_show_help will be identical to their opal
counterparts (the additional information passed to
orte_output_open() will be lost!). Indeed, the orte_* functions
simply become trivial wrappers to their opal_* counterparts. Note
that we have not tested this; the code is simple but it is quite
possible that we mucked something up.
= Filter Framework =
Messages sent view the new orte_* functions described above and
messages output via the IOF on the HNP will now optionally be passed
through a new "filter" framework before being output to
stdout/stderr. The "filter" OPAL MCA framework is intended to allow
preprocessing to messages before they are sent to their final
destinations. The first component that was written in the filter
framework was to create an XML stream, segregating all the messages
into different XML tags, etc. This will allow 3rd party tools to read
the stdout/stderr from the HNP and be able to know exactly what each
text message is (e.g., a help message, another OMPI infrastructure
message, stdout from the user process, stderr from the user process,
etc.).
Filtering is not active by default. Filter components must be
specifically requested, such as:
{{{
$ mpirun --mca filter xml ...
}}}
There can only be one filter component active.
= New MCA Parameters =
The new functionality described above introduces two new MCA
parameters:
* '''orte_base_help_aggregate''': Defaults to 1 (true), meaning that
help messages will be aggregated, as described above. If set to 0,
all help messages will be displayed, even if they are duplicates
(i.e., the original behavior).
* '''orte_base_show_output_recursions''': An MCA parameter to help
debug one of the known issues, described below. It is likely that
this MCA parameter will disappear before v1.3 final.
= Known Issues =
* The XML filter component is not complete. The current output from
this component is preliminary and not real XML. A bit more work
needs to be done to configure.m4 search for an appropriate XML
library/link it in/use it at run time.
* There are possible recursion loops in the orte_output() and
orte_show_help() functions -- e.g., if RML send calls orte_output()
or orte_show_help(). We have some ideas how to fix these, but
figured that it was ok to commit before feature freeze with known
issues. The code currently contains sub-optimal workarounds so
that this will not be a problem, but it would be good to actually
solve the problem rather than have hackish workarounds before v1.3 final.
This commit was SVN r18434.
2008-05-13 20:00:55 +00:00
|
|
|
orte_show_help("help-plm-rsh.txt", "deadlock-params",
|
2008-02-28 01:57:57 +00:00
|
|
|
true, mca_plm_rsh_component.num_concurrent, map->num_new_daemons);
|
|
|
|
rc = ORTE_ERR_FATAL;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* After a discussion between Ralph & Jeff, we concluded that we
|
|
|
|
* really are handling the prefix dir option incorrectly. It currently
|
|
|
|
* is associated with an app_context, yet it really refers to the
|
|
|
|
* location where OpenRTE/Open MPI is installed on a NODE. Fixing
|
|
|
|
* this right now would involve significant change to orterun as well
|
|
|
|
* as elsewhere, so we will intentionally leave this incorrect at this
|
|
|
|
* point. The error, however, is identical to that seen in all prior
|
|
|
|
* releases of OpenRTE/Open MPI, so our behavior is no worse than before.
|
|
|
|
*
|
|
|
|
* A note to fix this, along with ideas on how to do so, has been filed
|
|
|
|
* on the project's Trac system under "feature enhancement".
|
|
|
|
*
|
|
|
|
* For now, default to the prefix_dir provided in the first app_context.
|
|
|
|
* Since there always MUST be at least one app_context, we are safe in
|
|
|
|
* doing this.
|
|
|
|
*/
|
2009-07-17 22:20:30 +00:00
|
|
|
app = (orte_app_context_t*)opal_pointer_array_get_item(jdata->apps, 0);
|
|
|
|
/* we also need at least one node name so we can check what shell is
|
|
|
|
* being used, if we have to
|
|
|
|
*/
|
|
|
|
node = NULL;
|
|
|
|
for (nnode = 0; nnode < map->nodes->size; nnode++) {
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
if (NULL != (nd = (orte_node_t*)opal_pointer_array_get_item(map->nodes, nnode))) {
|
|
|
|
node = nd;
|
|
|
|
/* if the node is me, then we continue - we would
|
|
|
|
* prefer to find some other node so we can tell what the remote
|
|
|
|
* shell is, if necessary
|
|
|
|
*/
|
|
|
|
if (0 != strcmp(node->name, orte_process_info.nodename)) {
|
|
|
|
break;
|
|
|
|
}
|
2009-07-17 22:20:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (NULL == node) {
|
|
|
|
/* well, if there isn't even one node in the map, then we are hammered */
|
|
|
|
rc = ORTE_ERR_FATAL;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
prefix_dir = app->prefix_dir;
|
2008-02-28 01:57:57 +00:00
|
|
|
|
2008-04-14 18:26:08 +00:00
|
|
|
/* setup the launch */
|
2009-07-17 22:20:30 +00:00
|
|
|
if (ORTE_SUCCESS != (rc = setup_launch(&argc, &argv, node->name, &node_name_index1,
|
2008-10-08 14:21:42 +00:00
|
|
|
&proc_vpid_index, prefix_dir))) {
|
2008-04-14 18:26:08 +00:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2008-02-28 01:57:57 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2011-12-07 01:24:36 +00:00
|
|
|
|
2011-11-26 02:33:05 +00:00
|
|
|
/* if we are tree launching, find our children and create the launch cmd */
|
2008-04-14 18:26:08 +00:00
|
|
|
if (mca_plm_rsh_component.tree_spawn) {
|
2008-05-01 19:19:34 +00:00
|
|
|
orte_daemon_cmd_flag_t command = ORTE_DAEMON_TREE_SPAWN;
|
|
|
|
opal_byte_object_t bo, *boptr;
|
2011-11-26 02:33:05 +00:00
|
|
|
|
2008-05-01 19:19:34 +00:00
|
|
|
orte_tree_launch_cmd= OBJ_NEW(opal_buffer_t);
|
|
|
|
/* insert the tree_spawn cmd */
|
|
|
|
if (ORTE_SUCCESS != (rc = opal_dss.pack(orte_tree_launch_cmd, &command, 1, ORTE_DAEMON_CMD))) {
|
2008-04-14 18:26:08 +00:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2008-05-01 19:19:34 +00:00
|
|
|
OBJ_RELEASE(orte_tree_launch_cmd);
|
2008-04-14 18:26:08 +00:00
|
|
|
goto cleanup;
|
2008-04-24 18:38:24 +00:00
|
|
|
}
|
|
|
|
/* pack the prefix since this will be needed by the next wave */
|
2008-05-01 19:19:34 +00:00
|
|
|
if (ORTE_SUCCESS != (rc = opal_dss.pack(orte_tree_launch_cmd, &prefix_dir, 1, OPAL_STRING))) {
|
2008-04-24 18:38:24 +00:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2008-05-01 19:19:34 +00:00
|
|
|
OBJ_RELEASE(orte_tree_launch_cmd);
|
2008-04-24 18:38:24 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2008-05-01 19:19:34 +00:00
|
|
|
/* construct a nodemap */
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_util_encode_nodemap(&bo))) {
|
2008-02-28 01:57:57 +00:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2008-05-01 19:19:34 +00:00
|
|
|
OBJ_RELEASE(orte_tree_launch_cmd);
|
2008-02-28 01:57:57 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2008-05-01 19:19:34 +00:00
|
|
|
/* store it */
|
|
|
|
boptr = &bo;
|
|
|
|
if (ORTE_SUCCESS != (rc = opal_dss.pack(orte_tree_launch_cmd, &boptr, 1, OPAL_BYTE_OBJECT))) {
|
2008-04-14 18:26:08 +00:00
|
|
|
ORTE_ERROR_LOG(rc);
|
2008-05-01 19:19:34 +00:00
|
|
|
OBJ_RELEASE(orte_tree_launch_cmd);
|
|
|
|
free(bo.bytes);
|
2008-04-14 18:26:08 +00:00
|
|
|
goto cleanup;
|
2008-02-28 01:57:57 +00:00
|
|
|
}
|
2008-05-01 19:19:34 +00:00
|
|
|
/* release the data since it has now been copied into our buffer */
|
|
|
|
free(bo.bytes);
|
2011-11-26 02:33:05 +00:00
|
|
|
/* clear out any previous child info */
|
|
|
|
while (NULL != (item = opal_list_remove_first(&my_children))) {
|
|
|
|
OBJ_RELEASE(item);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get the updated routing tree */
|
|
|
|
my_parent = orte_routed.get_routing_tree(&my_children);
|
|
|
|
num_children = opal_list_get_size(&my_children);
|
2008-02-28 01:57:57 +00:00
|
|
|
}
|
|
|
|
|
2008-08-19 15:19:30 +00:00
|
|
|
/* set the job state to indicate we attempted to launch */
|
|
|
|
job_state = ORTE_JOB_STATE_FAILED_TO_START;
|
2009-12-02 20:29:32 +00:00
|
|
|
|
2008-02-28 01:57:57 +00:00
|
|
|
/*
|
|
|
|
* Iterate through each of the nodes
|
|
|
|
*/
|
2009-07-19 18:05:04 +00:00
|
|
|
for (nnode=0; nnode < map->nodes->size; nnode++) {
|
2008-02-28 01:57:57 +00:00
|
|
|
pid_t pid;
|
|
|
|
|
2009-07-17 22:20:30 +00:00
|
|
|
if (NULL == (node = (orte_node_t*)opal_pointer_array_get_item(map->nodes, nnode))) {
|
2009-07-19 18:05:04 +00:00
|
|
|
continue;
|
2009-07-17 22:20:30 +00:00
|
|
|
}
|
|
|
|
|
2008-04-14 18:26:08 +00:00
|
|
|
/* if we are tree launching, only launch our own children */
|
|
|
|
if (mca_plm_rsh_component.tree_spawn) {
|
2011-11-26 02:33:05 +00:00
|
|
|
for (item = opal_list_get_first(&my_children);
|
|
|
|
item != opal_list_get_end(&my_children);
|
2008-04-14 18:26:08 +00:00
|
|
|
item = opal_list_get_next(item)) {
|
2011-11-28 22:30:53 +00:00
|
|
|
orte_routed_tree_t *child = (orte_routed_tree_t*)item;
|
|
|
|
if (child->vpid == node->daemon->name.vpid) {
|
2008-04-14 18:26:08 +00:00
|
|
|
goto launch;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* didn't find it - ignore this node */
|
2011-11-27 01:49:42 +00:00
|
|
|
continue;
|
2008-04-14 18:26:08 +00:00
|
|
|
}
|
|
|
|
|
2011-11-27 01:49:42 +00:00
|
|
|
launch:
|
2008-02-28 01:57:57 +00:00
|
|
|
/* if this daemon already exists, don't launch it! */
|
2009-07-17 22:20:30 +00:00
|
|
|
if (node->daemon_launched) {
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-04-14 18:26:08 +00:00
|
|
|
"%s plm:rsh:launch daemon already exists on node %s",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
2009-07-17 22:20:30 +00:00
|
|
|
node->name));
|
2009-07-19 18:05:04 +00:00
|
|
|
continue;
|
2008-02-28 01:57:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* if the node's daemon has not been defined, then we
|
|
|
|
* have an error!
|
|
|
|
*/
|
2009-07-17 22:20:30 +00:00
|
|
|
if (NULL == node->daemon) {
|
2008-02-28 01:57:57 +00:00
|
|
|
ORTE_ERROR_LOG(ORTE_ERR_FATAL);
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-02-28 01:57:57 +00:00
|
|
|
"%s plm:rsh:launch daemon failed to be defined on node %s",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
2009-07-17 22:20:30 +00:00
|
|
|
node->name));
|
2008-03-25 22:42:24 +00:00
|
|
|
rc = ORTE_ERR_FATAL;
|
|
|
|
goto cleanup;
|
2008-02-28 01:57:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* setup node name */
|
|
|
|
free(argv[node_name_index1]);
|
2009-07-17 22:20:30 +00:00
|
|
|
if (NULL != node->username &&
|
|
|
|
0 != strlen (node->username)) {
|
2008-02-28 01:57:57 +00:00
|
|
|
asprintf (&argv[node_name_index1], "%s@%s",
|
2009-07-17 22:20:30 +00:00
|
|
|
node->username, node->name);
|
2008-02-28 01:57:57 +00:00
|
|
|
} else {
|
2009-07-17 22:20:30 +00:00
|
|
|
argv[node_name_index1] = strdup(node->name);
|
2008-02-28 01:57:57 +00:00
|
|
|
}
|
|
|
|
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-04-14 18:26:08 +00:00
|
|
|
"%s plm:rsh: launching on node %s",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
2009-07-17 22:20:30 +00:00
|
|
|
node->name));
|
2008-04-14 18:26:08 +00:00
|
|
|
|
2008-02-28 01:57:57 +00:00
|
|
|
/* fork a child to exec the rsh/ssh session */
|
|
|
|
pid = fork();
|
|
|
|
if (pid < 0) {
|
|
|
|
ORTE_ERROR_LOG(ORTE_ERR_SYS_LIMITS_CHILDREN);
|
|
|
|
rc = ORTE_ERR_SYS_LIMITS_CHILDREN;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* child */
|
|
|
|
if (pid == 0) {
|
|
|
|
|
2008-04-14 18:26:08 +00:00
|
|
|
/* do the ssh launch - this will exit if it fails */
|
2009-07-17 22:20:30 +00:00
|
|
|
ssh_child(argc, argv, node->daemon->name.vpid, proc_vpid_index);
|
2008-02-28 01:57:57 +00:00
|
|
|
|
|
|
|
|
|
|
|
} else { /* father */
|
|
|
|
/* indicate this daemon has been launched */
|
2009-07-17 22:20:30 +00:00
|
|
|
node->daemon->state = ORTE_PROC_STATE_LAUNCHED;
|
2008-03-31 18:15:24 +00:00
|
|
|
/* record the pid */
|
2009-07-17 22:20:30 +00:00
|
|
|
node->daemon->pid = pid;
|
2008-02-28 01:57:57 +00:00
|
|
|
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-04-14 18:26:08 +00:00
|
|
|
"%s plm:rsh: recording launch of daemon %s",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
2011-11-27 01:49:42 +00:00
|
|
|
ORTE_NAME_PRINT(&node->daemon->name)));
|
2008-04-14 18:26:08 +00:00
|
|
|
|
2009-12-02 20:29:32 +00:00
|
|
|
/* setup callback on sigchild - wait until setup above is complete
|
|
|
|
* as the callback can occur in the call to orte_wait_cb
|
|
|
|
*/
|
2011-11-26 02:33:05 +00:00
|
|
|
orte_wait_cb(pid, rsh_wait_daemon, (void*)node->daemon);
|
2009-12-02 20:29:32 +00:00
|
|
|
|
2008-02-28 01:57:57 +00:00
|
|
|
OPAL_THREAD_LOCK(&mca_plm_rsh_component.lock);
|
|
|
|
/* This situation can lead to a deadlock if '--debug-daemons' is set.
|
|
|
|
* However, the deadlock condition is tested at the begining of this
|
|
|
|
* function, so we're quite confident it should not happens here.
|
|
|
|
*/
|
2011-11-26 02:33:05 +00:00
|
|
|
if (num_active++ >= mca_plm_rsh_component.num_concurrent) {
|
2008-02-28 01:57:57 +00:00
|
|
|
opal_condition_wait(&mca_plm_rsh_component.cond, &mca_plm_rsh_component.lock);
|
|
|
|
}
|
|
|
|
OPAL_THREAD_UNLOCK(&mca_plm_rsh_component.lock);
|
|
|
|
|
|
|
|
/* if required - add delay to avoid problems w/ X11 authentication */
|
2011-11-27 01:49:42 +00:00
|
|
|
if (0 < mca_plm_rsh_component.delay.tv_sec ||
|
|
|
|
0 < mca_plm_rsh_component.delay.tv_nsec) {
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: adding delay of %ds:%dusec to launch cycle",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
(int)mca_plm_rsh_component.delay.tv_sec,
|
|
|
|
(int)mca_plm_rsh_component.delay.tv_nsec/1000));
|
|
|
|
nanosleep(&mca_plm_rsh_component.delay, NULL);
|
2008-02-28 01:57:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-11-26 02:33:05 +00:00
|
|
|
/* wait for daemons to callback - even those launched via tree will
|
|
|
|
* callback to mpirun, so all we need do is track them here
|
|
|
|
*/
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_plm_base_daemon_callback(map->num_new_daemons))) {
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
"%s plm:tm: daemon launch failed on error %s",
|
2011-11-26 02:33:05 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
ORTE_ERROR_NAME(rc)));
|
2011-11-26 02:33:05 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2009-12-02 20:29:32 +00:00
|
|
|
|
2011-11-27 01:49:42 +00:00
|
|
|
launch_apps:
|
Fix a potential, albeit perhaps esoteric, race condition that can occur for fast HNP's, slow orteds, and fast apps. Under those conditions, it is possible for the orted to be caught in its original send of contact info back to the HNP, and thus for the progress stack never to recover back to a high level. In those circumstances, the orted can "hang" when trying to exit.
Add a new function to opal_progress that tells us our recursion depth to support that solution.
Yes, I know this sounds picky, but good ol' Jeff managed to make it happen by driving his cluster near to death...
Also ensure that we declare "failed" for the daemon job when daemons fail instead of the application job. This is important so that orte knows that it cannot use xcast to tell daemons to "exit", nor should it expect all daemons to respond. Otherwise, it is possible to hang.
After lots of testing, decide to default (again) to slurm detecting failed orteds. This proved necessary to avoid rather annoying hangs that were difficult to recover from. There are conditions where slurm will fail to launch all daemons (slurm folks are working on it), and yet again, good ol' Jeff managed to find both of them.
Thanks you Jeff! :-/
This commit was SVN r18611.
2008-06-06 19:36:27 +00:00
|
|
|
/* if we get here, then the daemons succeeded, so any failure would now be
|
|
|
|
* for the application job
|
|
|
|
*/
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
/* setup the job */
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_plm_base_setup_job(jdata))) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
2011-12-15 18:04:48 +00:00
|
|
|
failed_job = jdata->jobid;
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
failed_job = jdata->jobid;
|
|
|
|
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_plm_base_launch_apps(jdata->jobid))) {
|
2008-06-09 14:53:58 +00:00
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
2008-02-28 01:57:57 +00:00
|
|
|
"%s plm:rsh: launch of apps failed for job %s on error %s",
|
2009-03-05 21:50:47 +00:00
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
Although we never really thought about it, we made an unconscious assumption in the mapper system - we assumed that the daemons would be placed on nodes in the order that the nodes appear in the allocation. In other words, we assumed that the launch environment would map processes in node order.
Turns out, this isn't necessarily true. The Cray, for example, launches processes in a toroidal pattern, thus causing the daemons to wind up somewhere other than what we thought. Other environments (e.g., slurm) are also capable of such behavior, depending upon the default mapping algorithm they are told to use.
Resolve this problem by making the daemon-to-node assignment in the affected environments when the daemon calls back and tells us what node it is on. Order the nodes in the mapping list so they are in daemon-vpid order as opposed to the order in which they show in the allocation. For environments that don't exhibit this mapping behavior (e.g., rsh), this won't have any impact.
Also, clean up the vm launch procedure a little bit so it more closely aligns with the state machine implementation that is coming, and remove some lingering "slave" code.
This commit was SVN r25551.
2011-11-30 19:58:24 +00:00
|
|
|
ORTE_JOBID_PRINT(jdata->jobid), ORTE_ERROR_NAME(rc)));
|
2008-02-28 01:57:57 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2009-07-20 01:51:29 +00:00
|
|
|
/* wait for the launch to complete */
|
|
|
|
OPAL_THREAD_LOCK(&orte_plm_globals.spawn_lock);
|
|
|
|
while (!orte_plm_globals.spawn_complete) {
|
|
|
|
opal_condition_wait(&orte_plm_globals.spawn_cond, &orte_plm_globals.spawn_lock);
|
|
|
|
}
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"completed spawn for job %s", ORTE_JOBID_PRINT(jdata->jobid)));
|
|
|
|
orte_plm_globals.spawn_in_progress = false;
|
|
|
|
opal_condition_broadcast(&orte_plm_globals.spawn_in_progress_cond);
|
|
|
|
OPAL_THREAD_UNLOCK(&orte_plm_globals.spawn_lock);
|
|
|
|
|
2008-02-28 01:57:57 +00:00
|
|
|
/* get here if launch went okay */
|
|
|
|
failed_launch = false;
|
|
|
|
|
2009-06-25 13:28:34 +00:00
|
|
|
if (orte_timing ) {
|
|
|
|
if (0 != gettimeofday(&joblaunchstop, NULL)) {
|
|
|
|
opal_output(0, "plm_rsh: could not obtain job launch stop time");
|
|
|
|
} else {
|
|
|
|
opal_output(0, "plm_rsh: total job launch time is %ld usec",
|
|
|
|
(joblaunchstop.tv_sec - joblaunchstart.tv_sec)*1000000 +
|
|
|
|
(joblaunchstop.tv_usec - joblaunchstart.tv_usec));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-28 01:57:57 +00:00
|
|
|
cleanup:
|
|
|
|
if (NULL != argv) {
|
|
|
|
opal_argv_free(argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check for failed launch - if so, force terminate */
|
|
|
|
if (failed_launch) {
|
2011-12-15 18:04:48 +00:00
|
|
|
if (ORTE_ERR_SILENT == rc) {
|
|
|
|
orte_errmgr.update_state(failed_job, ORTE_JOB_STATE_SILENT_ABORT,
|
|
|
|
NULL, ORTE_PROC_STATE_UNDEF,
|
|
|
|
0, ORTE_ERROR_DEFAULT_EXIT_CODE);
|
|
|
|
} else {
|
|
|
|
orte_errmgr.update_state(failed_job, job_state,
|
|
|
|
NULL, ORTE_PROC_STATE_UNDEF,
|
|
|
|
0, ORTE_ERROR_DEFAULT_EXIT_CODE);
|
|
|
|
}
|
2008-02-28 01:57:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2008-04-14 18:26:08 +00:00
|
|
|
* Terminate the orteds for a given job
|
2008-02-28 01:57:57 +00:00
|
|
|
*/
|
2011-11-26 02:33:05 +00:00
|
|
|
static int rsh_terminate_orteds(void)
|
2008-02-28 01:57:57 +00:00
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
|
2011-08-09 17:42:19 +00:00
|
|
|
/* now tell them to die */
|
|
|
|
if (orte_abnormal_term_ordered) {
|
|
|
|
/* cannot know if a daemon is able to
|
|
|
|
* tell us it died, so just ensure they
|
|
|
|
* all terminate
|
|
|
|
*/
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_plm_base_orted_exit(ORTE_DAEMON_HALT_VM_CMD))) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* we need them to "phone home", though,
|
|
|
|
* so we can know that they have exited
|
|
|
|
*/
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_plm_base_orted_exit(ORTE_DAEMON_EXIT_CMD))) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
}
|
2008-02-28 01:57:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-11-26 02:33:05 +00:00
|
|
|
static int rsh_finalize(void)
|
2008-02-28 01:57:57 +00:00
|
|
|
{
|
|
|
|
int rc;
|
2011-11-26 02:33:05 +00:00
|
|
|
opal_list_item_t *item;
|
2008-02-28 01:57:57 +00:00
|
|
|
|
|
|
|
/* cleanup any pending recvs */
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_plm_base_comm_stop())) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
}
|
2011-11-26 02:33:05 +00:00
|
|
|
|
|
|
|
/* cleanup the children tree */
|
|
|
|
while (NULL != (item = opal_list_remove_first(&my_children))) {
|
|
|
|
OBJ_RELEASE(item);
|
|
|
|
}
|
|
|
|
OBJ_DESTRUCT(&my_children);
|
|
|
|
num_children = 0;
|
|
|
|
|
2008-02-28 01:57:57 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void set_handler_default(int sig)
|
|
|
|
{
|
|
|
|
struct sigaction act;
|
|
|
|
|
|
|
|
act.sa_handler = SIG_DFL;
|
|
|
|
act.sa_flags = 0;
|
|
|
|
sigemptyset(&act.sa_mask);
|
|
|
|
|
|
|
|
sigaction(sig, &act, (struct sigaction *)0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static orte_plm_rsh_shell_t find_shell(char *shell)
|
|
|
|
{
|
|
|
|
int i = 0;
|
|
|
|
char *sh_name = NULL;
|
|
|
|
|
2009-03-24 13:26:57 +00:00
|
|
|
if( (NULL == shell) || (strlen(shell) == 1) ) {
|
|
|
|
/* Malformed shell */
|
|
|
|
return ORTE_PLM_RSH_SHELL_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
2008-02-28 01:57:57 +00:00
|
|
|
sh_name = rindex(shell, '/');
|
2009-03-24 13:26:57 +00:00
|
|
|
if( NULL == sh_name ) {
|
|
|
|
/* Malformed shell */
|
|
|
|
return ORTE_PLM_RSH_SHELL_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
2008-02-28 01:57:57 +00:00
|
|
|
/* skip the '/' */
|
|
|
|
++sh_name;
|
|
|
|
for (i = 0; i < (int)(sizeof (orte_plm_rsh_shell_name) /
|
|
|
|
sizeof(orte_plm_rsh_shell_name[0])); ++i) {
|
|
|
|
if (0 == strcmp(sh_name, orte_plm_rsh_shell_name[i])) {
|
2008-05-26 20:35:13 +00:00
|
|
|
return (orte_plm_rsh_shell_t)i;
|
2008-02-28 01:57:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We didn't find it */
|
|
|
|
return ORTE_PLM_RSH_SHELL_UNKNOWN;
|
|
|
|
}
|
2009-02-09 20:44:44 +00:00
|
|
|
|
2011-11-26 02:33:05 +00:00
|
|
|
static int launch_agent_setup(const char *agent, char *path)
|
|
|
|
{
|
|
|
|
char *bname;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* if no agent was provided, then report not found */
|
|
|
|
if (NULL == mca_plm_rsh_component.agent && NULL == agent) {
|
|
|
|
return ORTE_ERR_NOT_FOUND;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* search for the argv */
|
|
|
|
OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh_setup on agent %s path %s",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
(NULL == agent) ? mca_plm_rsh_component.agent : agent,
|
|
|
|
(NULL == path) ? "NULL" : path));
|
|
|
|
rsh_agent_argv = orte_plm_rsh_search(agent, path);
|
|
|
|
|
|
|
|
if (0 == opal_argv_count(rsh_agent_argv)) {
|
|
|
|
/* nothing was found */
|
|
|
|
return ORTE_ERR_NOT_FOUND;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* see if we can find the agent in the path */
|
|
|
|
rsh_agent_path = opal_path_findv(rsh_agent_argv[0], X_OK, environ, path);
|
|
|
|
|
|
|
|
if (NULL == rsh_agent_path) {
|
|
|
|
/* not an error - just report not found */
|
|
|
|
opal_argv_free(rsh_agent_argv);
|
|
|
|
return ORTE_ERR_NOT_FOUND;
|
|
|
|
}
|
|
|
|
|
|
|
|
bname = opal_basename(rsh_agent_argv[0]);
|
|
|
|
if (NULL != bname && 0 == strcmp(bname, "ssh")) {
|
|
|
|
/* if xterm option was given, add '-X', ensuring we don't do it twice */
|
|
|
|
if (NULL != orte_xterm) {
|
|
|
|
opal_argv_append_unique_nosize(&rsh_agent_argv, "-X", false);
|
|
|
|
} else if (0 >= opal_output_get_verbosity(orte_plm_globals.output)) {
|
|
|
|
/* if debug was not specified, and the user didn't explicitly
|
|
|
|
* specify X11 forwarding/non-forwarding, add "-x" if it
|
|
|
|
* isn't already there (check either case)
|
|
|
|
*/
|
|
|
|
for (i = 1; NULL != rsh_agent_argv[i]; ++i) {
|
|
|
|
if (0 == strcasecmp("-x", rsh_agent_argv[i])) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (NULL == rsh_agent_argv[i]) {
|
|
|
|
opal_argv_append_nosize(&rsh_agent_argv, "-x");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* the caller can append any additional argv's they desire */
|
|
|
|
return ORTE_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Check the Shell variable on the specified node
|
|
|
|
*/
|
|
|
|
static int rsh_probe(char *nodename,
|
|
|
|
orte_plm_rsh_shell_t *shell)
|
|
|
|
{
|
|
|
|
char ** argv;
|
|
|
|
int argc, rc = ORTE_SUCCESS, i;
|
|
|
|
int fd[2];
|
|
|
|
pid_t pid;
|
|
|
|
char outbuf[4096];
|
|
|
|
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: going to check SHELL variable on node %s",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
nodename));
|
|
|
|
|
|
|
|
*shell = ORTE_PLM_RSH_SHELL_UNKNOWN;
|
|
|
|
if (pipe(fd)) {
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: pipe failed with errno=%d",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
errno));
|
|
|
|
return ORTE_ERR_IN_ERRNO;
|
|
|
|
}
|
|
|
|
if ((pid = fork()) < 0) {
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: fork failed with errno=%d",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
errno));
|
|
|
|
return ORTE_ERR_IN_ERRNO;
|
|
|
|
}
|
|
|
|
else if (pid == 0) { /* child */
|
|
|
|
if (dup2(fd[1], 1) < 0) {
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: dup2 failed with errno=%d",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
errno));
|
|
|
|
exit(01);
|
|
|
|
}
|
|
|
|
/* Build argv array */
|
|
|
|
argv = opal_argv_copy(rsh_agent_argv);
|
|
|
|
argc = opal_argv_count(rsh_agent_argv);
|
|
|
|
opal_argv_append(&argc, &argv, nodename);
|
|
|
|
opal_argv_append(&argc, &argv, "echo $SHELL");
|
|
|
|
|
|
|
|
execvp(argv[0], argv);
|
|
|
|
exit(errno);
|
|
|
|
}
|
|
|
|
if (close(fd[1])) {
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: close failed with errno=%d",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
errno));
|
|
|
|
return ORTE_ERR_IN_ERRNO;
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
ssize_t ret = 1;
|
|
|
|
char* ptr = outbuf;
|
|
|
|
size_t outbufsize = sizeof(outbuf);
|
|
|
|
|
|
|
|
do {
|
|
|
|
ret = read (fd[0], ptr, outbufsize-1);
|
|
|
|
if (ret < 0) {
|
|
|
|
if (errno == EINTR)
|
|
|
|
continue;
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: Unable to detect the remote shell (error %s)",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
strerror(errno)));
|
|
|
|
rc = ORTE_ERR_IN_ERRNO;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( outbufsize > 1 ) {
|
|
|
|
outbufsize -= ret;
|
|
|
|
ptr += ret;
|
|
|
|
}
|
|
|
|
} while( 0 != ret );
|
|
|
|
*ptr = '\0';
|
|
|
|
}
|
|
|
|
close(fd[0]);
|
|
|
|
|
|
|
|
if( outbuf[0] != '\0' ) {
|
|
|
|
char *sh_name = rindex(outbuf, '/');
|
|
|
|
if( NULL != sh_name ) {
|
|
|
|
sh_name++; /* skip '/' */
|
|
|
|
/* We cannot use "echo -n $SHELL" because -n is not portable. Therefore
|
|
|
|
* we have to remove the "\n" */
|
|
|
|
if ( sh_name[strlen(sh_name)-1] == '\n' ) {
|
|
|
|
sh_name[strlen(sh_name)-1] = '\0';
|
|
|
|
}
|
|
|
|
/* Search for the substring of known shell-names */
|
|
|
|
for (i = 0; i < (int)(sizeof (orte_plm_rsh_shell_name)/
|
|
|
|
sizeof(orte_plm_rsh_shell_name[0])); i++) {
|
|
|
|
if ( 0 == strcmp(sh_name, orte_plm_rsh_shell_name[i]) ) {
|
|
|
|
*shell = (orte_plm_rsh_shell_t)i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: node %s has SHELL: %s",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
nodename,
|
|
|
|
(ORTE_PLM_RSH_SHELL_UNKNOWN == *shell) ? "UNHANDLED" : (char*)orte_plm_rsh_shell_name[*shell]));
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int setup_shell(orte_plm_rsh_shell_t *rshell,
|
|
|
|
orte_plm_rsh_shell_t *lshell,
|
|
|
|
char *nodename, int *argc, char ***argv)
|
|
|
|
{
|
|
|
|
orte_plm_rsh_shell_t remote_shell, local_shell;
|
|
|
|
struct passwd *p;
|
|
|
|
char *param;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
/* What is our local shell? */
|
|
|
|
local_shell = ORTE_PLM_RSH_SHELL_UNKNOWN;
|
|
|
|
p = getpwuid(getuid());
|
|
|
|
if( NULL == p ) {
|
|
|
|
/* This user is unknown to the system. Therefore, there is no reason we
|
|
|
|
* spawn whatsoever in his name. Give up with a HUGE error message.
|
|
|
|
*/
|
|
|
|
orte_show_help( "help-plm-rsh.txt", "unknown-user", true, (int)getuid() );
|
|
|
|
return ORTE_ERR_FATAL;
|
|
|
|
}
|
|
|
|
param = p->pw_shell;
|
|
|
|
local_shell = find_shell(p->pw_shell);
|
|
|
|
|
|
|
|
/* If we didn't find it in getpwuid(), try looking at the $SHELL
|
|
|
|
environment variable (see https://svn.open-mpi.org/trac/ompi/ticket/1060)
|
|
|
|
*/
|
|
|
|
if (ORTE_PLM_RSH_SHELL_UNKNOWN == local_shell &&
|
|
|
|
NULL != (param = getenv("SHELL"))) {
|
|
|
|
local_shell = find_shell(param);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ORTE_PLM_RSH_SHELL_UNKNOWN == local_shell) {
|
|
|
|
opal_output(0, "WARNING: local probe returned unhandled shell:%s assuming bash\n",
|
|
|
|
(NULL != param) ? param : "unknown");
|
|
|
|
local_shell = ORTE_PLM_RSH_SHELL_BASH;
|
|
|
|
}
|
|
|
|
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: local shell: %d (%s)",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
local_shell, orte_plm_rsh_shell_name[local_shell]));
|
|
|
|
|
|
|
|
/* What is our remote shell? */
|
|
|
|
if (mca_plm_rsh_component.assume_same_shell) {
|
|
|
|
remote_shell = local_shell;
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: assuming same remote shell as local shell",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
|
|
|
|
} else {
|
|
|
|
rc = rsh_probe(nodename, &remote_shell);
|
|
|
|
|
|
|
|
if (ORTE_SUCCESS != rc) {
|
|
|
|
ORTE_ERROR_LOG(rc);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ORTE_PLM_RSH_SHELL_UNKNOWN == remote_shell) {
|
|
|
|
opal_output(0, "WARNING: rsh probe returned unhandled shell; assuming bash\n");
|
|
|
|
remote_shell = ORTE_PLM_RSH_SHELL_BASH;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
|
|
|
|
"%s plm:rsh: remote shell: %d (%s)",
|
|
|
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
|
|
|
remote_shell, orte_plm_rsh_shell_name[remote_shell]));
|
|
|
|
|
|
|
|
/* Do we need to source .profile on the remote side?
|
|
|
|
- sh: yes (see bash(1))
|
|
|
|
- ksh: yes (see ksh(1))
|
|
|
|
- bash: no (see bash(1))
|
|
|
|
- [t]csh: no (see csh(1) and tcsh(1))
|
|
|
|
- zsh: no (see http://zsh.sourceforge.net/FAQ/zshfaq03.html#l19)
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (ORTE_PLM_RSH_SHELL_SH == remote_shell ||
|
|
|
|
ORTE_PLM_RSH_SHELL_KSH == remote_shell) {
|
|
|
|
int i;
|
|
|
|
char **tmp;
|
|
|
|
tmp = opal_argv_split("( test ! -r ./.profile || . ./.profile;", ' ');
|
|
|
|
if (NULL == tmp) {
|
|
|
|
return ORTE_ERR_OUT_OF_RESOURCE;
|
|
|
|
}
|
|
|
|
for (i = 0; NULL != tmp[i]; ++i) {
|
|
|
|
opal_argv_append(argc, argv, tmp[i]);
|
|
|
|
}
|
|
|
|
opal_argv_free(tmp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* pass results back */
|
|
|
|
*rshell = remote_shell;
|
|
|
|
*lshell = local_shell;
|
|
|
|
|
|
|
|
return ORTE_SUCCESS;
|
|
|
|
}
|