If the nodename is an IP address, we need to retain the full name (even if keep_fqdn is false) so that the ssh tree spawn can proceed.
cmr:v1.7 This commit was SVN r27561.
Этот коммит содержится в:
родитель
280930e299
Коммит
27b41a7db4
@ -243,6 +243,7 @@ int orte_util_encode_nodemap(opal_byte_object_t *boptr, bool update)
|
||||
{
|
||||
orte_node_t *node;
|
||||
int32_t i;
|
||||
size_t j;
|
||||
int rc;
|
||||
opal_buffer_t buf;
|
||||
char *ptr, *nodename;
|
||||
@ -292,9 +293,16 @@ int orte_util_encode_nodemap(opal_byte_object_t *boptr, bool update)
|
||||
/* pack the name of the node */
|
||||
if (!orte_keep_fqdn_hostnames) {
|
||||
nodename = strdup(node->name);
|
||||
/* if the nodename is an IP address, do not mess with it! */
|
||||
for (j=0; j < strlen(nodename)-1; j++) {
|
||||
if (isalpha(nodename[j]) && '.' != nodename[j]) {
|
||||
/* not an IP address */
|
||||
if (NULL != (ptr = strchr(nodename, '.'))) {
|
||||
*ptr = '\0';
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack(&buf, &nodename, 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user