ovn-nbctl: Daemon mode should retry when IDL connection lost.

When creating IDL, "retry" was set to false. However, in daemon
mode, reconnecting upon DB server failure should be transparent
to user. This even impacts HA mode. E.g. in clustered mode, although
IDL tries to connect to next server, but at the first retry the
server fail-over may not be completed yet, and it stops retry after
N (N = number of remotes) times.

This patch makes sure in daemon mode retry is set to true so that
the daemon will automatically retry forever.

Signed-off-by: Han Zhou <hzhou8@ebay.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c
index 2fa0b3389..cca7dbaa1 100644
--- a/ovn/utilities/ovn-nbctl.c
+++ b/ovn/utilities/ovn-nbctl.c
@@ -174,15 +174,19 @@ main(int argc, char *argv[])
     apply_options_direct(parsed_options, n_parsed_options, &local_options);
     free(parsed_options);
 
-    /* Initialize IDL. */
-    idl = the_idl = ovsdb_idl_create(db, &nbrec_idl_class, true, false);
-    ovsdb_idl_set_leader_only(idl, leader_only);
-
+    bool daemon_mode = false;
     if (get_detach()) {
         if (argc != optind) {
             ctl_fatal("non-option arguments not supported with --detach "
                       "(use --help for help)");
         }
+        daemon_mode = true;
+    }
+    /* Initialize IDL. "retry" is true iff in daemon mode. */
+    idl = the_idl = ovsdb_idl_create(db, &nbrec_idl_class, true, daemon_mode);
+    ovsdb_idl_set_leader_only(idl, leader_only);
+
+    if (daemon_mode) {
         server_loop(idl, argc, argv);
     } else {
         struct ctl_command *commands;