Skip to content

Commit

Permalink
ovn-controller: Drop unnecessary checks for ovsdb_idl_is_alive().
Browse files Browse the repository at this point in the history
The IDLs as created by ovn-controller always retry failed connections,
which means that ovsdb_idl_is_alive() will always report that they are
alive.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Russell Bryant <rbryant@redhat.com>
  • Loading branch information
blp committed Jul 28, 2015
1 parent 9326534 commit acd55f5
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions ovn/controller/ovn-controller.c
Expand Up @@ -210,22 +210,6 @@ main(int argc, char *argv[])
break;
}

if (!ovsdb_idl_is_alive(ctx.ovnsb_idl)) {
int retval = ovsdb_idl_get_last_error(ctx.ovnsb_idl);
VLOG_ERR("%s: database connection failed (%s)",
ovnsb_remote, ovs_retval_to_string(retval));
retval = EXIT_FAILURE;
break;
}

if (!ovsdb_idl_is_alive(ctx.ovs_idl)) {
int retval = ovsdb_idl_get_last_error(ctx.ovs_idl);
VLOG_ERR("%s: database connection failed (%s)",
ovs_remote, ovs_retval_to_string(retval));
retval = EXIT_FAILURE;
break;
}

ofctrl_clear_flows();

chassis_run(&ctx);
Expand Down

0 comments on commit acd55f5

Please sign in to comment.