Cleanup the slave launch - completed debugging. w00t!
This commit was SVN r21113.
Этот коммит содержится в:
родитель
7194f1636f
Коммит
1fb92e2766
@ -300,7 +300,7 @@ int orte_plm_base_local_slave_launch(orte_job_t *jdata)
|
|||||||
free(bootproxy);
|
free(bootproxy);
|
||||||
} else {
|
} else {
|
||||||
/* the bootproxy has been positioned - setup to use it */
|
/* the bootproxy has been positioned - setup to use it */
|
||||||
OPAL_OUTPUT_VERBOSE((0, orte_plm_globals.output,
|
OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output,
|
||||||
"%s plm:base:local:slave: bootproxy %s already positioned",
|
"%s plm:base:local:slave: bootproxy %s already positioned",
|
||||||
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), slave_node->bootproxy));
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), slave_node->bootproxy));
|
||||||
if (slave_node->local) {
|
if (slave_node->local) {
|
||||||
@ -366,7 +366,7 @@ int orte_plm_base_local_slave_launch(orte_job_t *jdata)
|
|||||||
if (NULL != (filenm = opal_pointer_array_get_item(&slave_node->apps, i)) &&
|
if (NULL != (filenm = opal_pointer_array_get_item(&slave_node->apps, i)) &&
|
||||||
0 == strcmp(filenm, dest)) {
|
0 == strcmp(filenm, dest)) {
|
||||||
/* this app already has been positioned on the node - skip it */
|
/* this app already has been positioned on the node - skip it */
|
||||||
OPAL_OUTPUT_VERBOSE((0, orte_plm_globals.output,
|
OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output,
|
||||||
"%s plm:base:local:slave: app %s already positioned",
|
"%s plm:base:local:slave: app %s already positioned",
|
||||||
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), filenm));
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), filenm));
|
||||||
goto PRELOAD_FILES;
|
goto PRELOAD_FILES;
|
||||||
@ -413,7 +413,7 @@ int orte_plm_base_local_slave_launch(orte_job_t *jdata)
|
|||||||
if (NULL != (filenm = opal_pointer_array_get_item(&slave_node->apps, i)) &&
|
if (NULL != (filenm = opal_pointer_array_get_item(&slave_node->apps, i)) &&
|
||||||
0 == strcmp(filenm, app->app)) {
|
0 == strcmp(filenm, app->app)) {
|
||||||
/* this app already has been positioned on the node - skip it */
|
/* this app already has been positioned on the node - skip it */
|
||||||
OPAL_OUTPUT_VERBOSE((0, orte_plm_globals.output,
|
OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output,
|
||||||
"%s plm:base:local:slave: app %s already positioned",
|
"%s plm:base:local:slave: app %s already positioned",
|
||||||
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), filenm));
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), filenm));
|
||||||
goto PRELOAD_FILES;
|
goto PRELOAD_FILES;
|
||||||
@ -476,7 +476,7 @@ PRELOAD_FILES:
|
|||||||
if (NULL != (filenm = opal_pointer_array_get_item(&slave_node->files, i)) &&
|
if (NULL != (filenm = opal_pointer_array_get_item(&slave_node->files, i)) &&
|
||||||
0 == strcmp(filenm, dest)) {
|
0 == strcmp(filenm, dest)) {
|
||||||
/* this app already has been positioned on the node - skip it */
|
/* this app already has been positioned on the node - skip it */
|
||||||
OPAL_OUTPUT_VERBOSE((0, orte_plm_globals.output,
|
OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output,
|
||||||
"%s plm:base:local:slave: file %s already positioned",
|
"%s plm:base:local:slave: file %s already positioned",
|
||||||
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), filenm));
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), filenm));
|
||||||
goto SKIP;
|
goto SKIP;
|
||||||
@ -760,13 +760,13 @@ void orte_plm_base_local_slave_finalize(void)
|
|||||||
int i;
|
int i;
|
||||||
bool first;
|
bool first;
|
||||||
|
|
||||||
OPAL_OUTPUT_VERBOSE((0, orte_plm_globals.output,
|
OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output,
|
||||||
"%s plm:base:local:slave:finalize",
|
"%s plm:base:local:slave:finalize",
|
||||||
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
|
||||||
|
|
||||||
while (NULL != (item = opal_list_remove_first(&orte_plm_globals.slave_files))) {
|
while (NULL != (item = opal_list_remove_first(&orte_plm_globals.slave_files))) {
|
||||||
slave_node = (orte_slave_files_t*)item;
|
slave_node = (orte_slave_files_t*)item;
|
||||||
OPAL_OUTPUT_VERBOSE((0, orte_plm_globals.output,
|
OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output,
|
||||||
"%s plm:base:local:slave:finalize - entry for node %s",
|
"%s plm:base:local:slave:finalize - entry for node %s",
|
||||||
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), slave_node->node));
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), slave_node->node));
|
||||||
|
|
||||||
|
@ -48,8 +48,9 @@ if [ "${var}" == "CLEANUP" ]; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
# remove any session directories from this user
|
# remove any session directories from this user
|
||||||
sdir="${TMPDIR}""openmpi-sessions-""${USER}""@"`hostname`"_0"
|
# sdir="${TMPDIR}""openmpi-sessions-""${USER}""@"`hostname`"_0"
|
||||||
# echo "rm" "${sdir}"
|
# echo "rm" "${sdir}"
|
||||||
|
sdir="/tmp/openmpi-sessions-""${USER}""@"`hostname`"_0
|
||||||
rm -rf "${sdir}"
|
rm -rf "${sdir}"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user