Fix a potential bug in the registry where it didn't fully check a segment's name when searching for it. Will have to verify that this doesn't break other things.
Bring the bproc system close to being back online.... This commit was SVN r12659.
Этот коммит содержится в:
родитель
32833deff0
Коммит
9bc25f0bec
@ -34,7 +34,6 @@
|
|||||||
int orte_gpr_replica_find_seg(orte_gpr_replica_segment_t **seg,
|
int orte_gpr_replica_find_seg(orte_gpr_replica_segment_t **seg,
|
||||||
bool create, char *segment)
|
bool create, char *segment)
|
||||||
{
|
{
|
||||||
orte_std_cntr_t len;
|
|
||||||
int rc=ORTE_SUCCESS;
|
int rc=ORTE_SUCCESS;
|
||||||
orte_std_cntr_t i, cntri;
|
orte_std_cntr_t i, cntri;
|
||||||
orte_gpr_replica_segment_t **ptr;
|
orte_gpr_replica_segment_t **ptr;
|
||||||
@ -53,8 +52,6 @@ int orte_gpr_replica_find_seg(orte_gpr_replica_segment_t **seg,
|
|||||||
return ORTE_SUCCESS;
|
return ORTE_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
len = (orte_std_cntr_t)strlen(segment);
|
|
||||||
|
|
||||||
/* search the registry segments to find which one is being referenced */
|
/* search the registry segments to find which one is being referenced */
|
||||||
ptr = (orte_gpr_replica_segment_t**)(orte_gpr_replica.segments->addr);
|
ptr = (orte_gpr_replica_segment_t**)(orte_gpr_replica.segments->addr);
|
||||||
cntri = 0;
|
cntri = 0;
|
||||||
@ -62,7 +59,7 @@ int orte_gpr_replica_find_seg(orte_gpr_replica_segment_t **seg,
|
|||||||
i < (orte_gpr_replica.segments)->size; i++) {
|
i < (orte_gpr_replica.segments)->size; i++) {
|
||||||
if (NULL != ptr[i]) {
|
if (NULL != ptr[i]) {
|
||||||
cntri++;
|
cntri++;
|
||||||
if (0 == strncmp(segment, ptr[i]->name, len)) {
|
if (0 == strcmp(segment, ptr[i]->name)) {
|
||||||
*seg = ptr[i];
|
*seg = ptr[i];
|
||||||
return ORTE_SUCCESS;
|
return ORTE_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -118,7 +118,6 @@ static int orte_ras_bjs_discover(
|
|||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
/* query the nodelist from the registry */
|
/* query the nodelist from the registry */
|
||||||
OBJ_CONSTRUCT(&new_nodes, opal_list_t);
|
|
||||||
if(ORTE_SUCCESS != (rc = orte_ras_base_node_query(nodelist))) {
|
if(ORTE_SUCCESS != (rc = orte_ras_base_node_query(nodelist))) {
|
||||||
ORTE_ERROR_LOG(rc);
|
ORTE_ERROR_LOG(rc);
|
||||||
return rc;
|
return rc;
|
||||||
|
@ -251,7 +251,7 @@ static void update_registry(bit_set changes, struct bproc_node_info_t *ni)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (mca_smr_bproc_component.debug)
|
if (mca_smr_bproc_component.debug)
|
||||||
opal_output(0, "updating node %d\n", ni->node);
|
opal_output(0, "updating node %d to segment %s\n", ni->node, value->segment);
|
||||||
|
|
||||||
if ((ret = orte_gpr.put(1, &value)) != ORTE_SUCCESS) {
|
if ((ret = orte_gpr.put(1, &value)) != ORTE_SUCCESS) {
|
||||||
ORTE_ERROR_LOG(ret);
|
ORTE_ERROR_LOG(ret);
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user