Frazzle-frump! Missed that we reset the peer state just before the new check.
Refs trac:4870 This commit was SVN r32554. The following Trac tickets were found above: Ticket 4870 --> https://svn.open-mpi.org/trac/ompi/ticket/4870
Этот коммит содержится в:
родитель
0a91fdf85f
Коммит
343038af7b
@ -793,22 +793,24 @@ void mca_oob_tcp_peer_close(mca_oob_tcp_peer_t *peer)
|
|||||||
ORTE_NAME_PRINT(&(peer->name)),
|
ORTE_NAME_PRINT(&(peer->name)),
|
||||||
peer->sd, mca_oob_tcp_state_print(peer->state));
|
peer->sd, mca_oob_tcp_state_print(peer->state));
|
||||||
|
|
||||||
peer->state = MCA_OOB_TCP_CLOSED;
|
|
||||||
if (NULL != peer->active_addr) {
|
|
||||||
peer->active_addr->state = MCA_OOB_TCP_CLOSED;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* release the socket */
|
/* release the socket */
|
||||||
close(peer->sd);
|
close(peer->sd);
|
||||||
|
|
||||||
/* if we were CONNECTING, then we need to mark the address as
|
/* if we were CONNECTING, then we need to mark the address as
|
||||||
* failed and cycle back to try the next address */
|
* failed and cycle back to try the next address */
|
||||||
if (MCA_OOB_TCP_CONNECTING == peer->state) {
|
if (MCA_OOB_TCP_CONNECTING == peer->state) {
|
||||||
peer->active_addr->state = MCA_OOB_TCP_FAILED;
|
if (NULL != peer->active_addr) {
|
||||||
|
peer->active_addr->state = MCA_OOB_TCP_FAILED;
|
||||||
|
}
|
||||||
ORTE_ACTIVATE_TCP_CONN_STATE(peer, mca_oob_tcp_peer_try_connect);
|
ORTE_ACTIVATE_TCP_CONN_STATE(peer, mca_oob_tcp_peer_try_connect);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
peer->state = MCA_OOB_TCP_CLOSED;
|
||||||
|
if (NULL != peer->active_addr) {
|
||||||
|
peer->active_addr->state = MCA_OOB_TCP_CLOSED;
|
||||||
|
}
|
||||||
|
|
||||||
/* inform the component-level that we have lost a connection so
|
/* inform the component-level that we have lost a connection so
|
||||||
* it can decide what to do about it.
|
* it can decide what to do about it.
|
||||||
*/
|
*/
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user