]> git.proxmox.com Git - mirror_ovs.git/commitdiff
ovn-controller: Drop unnecessary checks for ovsdb_idl_is_alive().
authorBen Pfaff <blp@nicira.com>
Mon, 13 Jul 2015 00:20:42 +0000 (17:20 -0700)
committerBen Pfaff <blp@nicira.com>
Tue, 28 Jul 2015 18:02:35 +0000 (11:02 -0700)
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>
ovn/controller/ovn-controller.c

index bd3ef0d66d8696cf294fcde6085fbde74e916e9c..6f94187cade796b29e8ec3c25101033e156b1ea9 100644 (file)
@@ -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);