The netdev-dummy unit test ran into the reconnect condition on Jarno's
machine. With his test environment, we found and fixed the bugs in
handling reconnect.
Co-authored-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
txbuf = ofpbuf_from_list(list_front(&s->txq));
retval = stream_send(s->stream, txbuf->data, txbuf->size);
txbuf = ofpbuf_from_list(list_front(&s->txq));
retval = stream_send(s->stream, txbuf->data, txbuf->size);
if (retval > 0) {
ofpbuf_pull(txbuf, retval);
if (!txbuf->size) {
if (retval > 0) {
ofpbuf_pull(txbuf, retval);
if (!txbuf->size) {
ofpbuf_prealloc_tailroom(&s->rxbuf, n);
retval = stream_recv(s->stream, ofpbuf_tail(&s->rxbuf), n);
ofpbuf_prealloc_tailroom(&s->rxbuf, n);
retval = stream_recv(s->stream, ofpbuf_tail(&s->rxbuf), n);
if (retval > 0) {
s->rxbuf.size += retval;
if (retval == n && s->rxbuf.size > 2) {
if (retval > 0) {
s->rxbuf.size += retval;
if (retval == n && s->rxbuf.size > 2) {
reconnect_set_backoff(reconnect, 1000, INT_MAX);
reconnect_set_probe_interval(reconnect, 0);
conn->u.rconn.reconnect = reconnect;
reconnect_set_backoff(reconnect, 1000, INT_MAX);
reconnect_set_probe_interval(reconnect, 0);
conn->u.rconn.reconnect = reconnect;
error = stream_open(stream, &active_stream, DSCP_DEFAULT);
conn->u.rconn.rstream = dummy_packet_stream_create(active_stream);
switch (error) {
case 0:
error = stream_open(stream, &active_stream, DSCP_DEFAULT);
conn->u.rconn.rstream = dummy_packet_stream_create(active_stream);
switch (error) {
case 0:
- reconnect_connected(conn->u.rconn.reconnect, time_msec());
- conn->type = ACTIVE;
+ reconnect_connected(reconnect, time_msec());
- reconnect_connecting(conn->u.rconn.reconnect, time_msec());
+ reconnect_connecting(reconnect, time_msec());
- reconnect_connecting(conn->u.rconn.reconnect, time_msec());
+ reconnect_connect_failed(reconnect, time_msec(), error);
stream_close(active_stream);
stream_close(active_stream);
+ conn->u.rconn.rstream->stream = NULL;
switch (reconnect_run(rconn->reconnect, time_msec())) {
case RECONNECT_CONNECT:
{
switch (reconnect_run(rconn->reconnect, time_msec())) {
case RECONNECT_CONNECT:
{
- int err = stream_connect(rconn->rstream->stream);
+ int error;
+
+ if (rconn->rstream->stream) {
+ error = stream_connect(rconn->rstream->stream);
+ } else {
+ error = stream_open(reconnect_get_name(rconn->reconnect),
+ &rconn->rstream->stream, DSCP_DEFAULT);
+ }
- switch (err) {
- case 0: /* Connected. */
+ switch (error) {
+ case 0:
reconnect_connected(rconn->reconnect, time_msec());
reconnect_connected(rconn->reconnect, time_msec());
- dev->conn.type = ACTIVE;
break;
case EAGAIN:
reconnect_connecting(rconn->reconnect, time_msec());
break;
case EAGAIN:
reconnect_connecting(rconn->reconnect, time_msec());
- reconnect_connect_failed(rconn->reconnect, time_msec(), err);
+ reconnect_connect_failed(rconn->reconnect, time_msec(), error);
stream_close(rconn->rstream->stream);
stream_close(rconn->rstream->stream);
+ rconn->rstream->stream = NULL;
+ break;
if (err) {
reconnect_disconnected(rconn->reconnect, time_msec(), err);
stream_close(rconn->rstream->stream);
if (err) {
reconnect_disconnected(rconn->reconnect, time_msec(), err);
stream_close(rconn->rstream->stream);
+ rconn->rstream->stream = NULL;
- dummy_packet_stream_wait(conn->u.rconn.rstream);
+ if (reconnect_is_connected(conn->u.rconn.reconnect)) {
+ dummy_packet_stream_wait(conn->u.rconn.rstream);
+ }
- dummy_packet_stream_send(conn->u.rconn.rstream, buffer, size);
- dummy_packet_stream_wait(conn->u.rconn.rstream);
+ if (reconnect_is_connected(conn->u.rconn.reconnect)) {
+ dummy_packet_stream_send(conn->u.rconn.rstream, buffer, size);
+ dummy_packet_stream_wait(conn->u.rconn.rstream);
+ }
} else {
const char *type = fsm->passive ? "listen" : "connection";
if (error > 0) {
} else {
const char *type = fsm->passive ? "listen" : "connection";
if (error > 0) {
- VLOG_WARN("%s: %s attempt failed (%s)",
+ VLOG_INFO("%s: %s attempt failed (%s)",
fsm->name, type, ovs_strerror(error));
} else {
VLOG(fsm->info, "%s: %s attempt timed out", fsm->name, type);
fsm->name, type, ovs_strerror(error));
} else {
VLOG(fsm->info, "%s: %s attempt timed out", fsm->name, type);