ovsdb: Introduce OVSDB replication feature

Replication is enabled by using the following option when starting the
database server:

--sync-from=server

Where 'server' can take any form described in the ovsdb-client(1)
manpage as an active connection. If this option is specified, the
replication process is immediately started.

Signed-off-by: Mario Cabrera <[email protected]>
Signed-off-by: Ben Pfaff <[email protected]>

manpages.mk

@@ -64,7 +64,9 @@ ovsdb/ovsdb-server.1: \
 	lib/vlog-unixctl.man \
 	lib/vlog.man \
 	ovsdb/remote-active.man \
-	ovsdb/remote-passive.man
+	ovsdb/remote-passive.man \
+	ovsdb/replication-syn.man \
+	ovsdb/replication.man
 ovsdb/ovsdb-server.1.in:
 lib/common-syn.man:
 lib/common.man:
@@ -87,6 +89,8 @@ lib/vlog-unixctl.man:
 lib/vlog.man:
 ovsdb/remote-active.man:
 ovsdb/remote-passive.man:
+ovsdb/replication-syn.man:
+ovsdb/replication.man:
 
 ovsdb/ovsdb-tool.1: \
 	ovsdb/ovsdb-tool.1.in \

ovsdb/automake.mk

@@ -24,6 +24,8 @@ ovsdb_libovsdb_la_SOURCES = \
 	ovsdb/monitor.h \
 	ovsdb/query.c \
 	ovsdb/query.h \
+	ovsdb/replication.c \
+	ovsdb/replication.h \
 	ovsdb/row.c \
 	ovsdb/row.h \
 	ovsdb/server.c \
@@ -42,7 +44,9 @@ pkgconfig_DATA += \
 
 MAN_FRAGMENTS += \
 	ovsdb/remote-active.man \
-	ovsdb/remote-passive.man
+	ovsdb/remote-passive.man \
+	ovsdb/replication.man \
+	ovsdb/replication-syn.man
 
 # ovsdb-tool
 bin_PROGRAMS += ovsdb/ovsdb-tool

ovsdb/ovsdb-server.1.in

@@ -19,6 +19,7 @@ ovsdb\-server \- Open vSwitch database server
 .so lib/daemon-syn.man
 .so lib/service-syn.man
 .so lib/vlog-syn.man
+.so ovsdb/replication-syn.man
 .so lib/ssl-syn.man
 .so lib/ssl-bootstrap-syn.man
 .so lib/ssl-peer-ca-cert-syn.man
@@ -100,6 +101,8 @@ configured remotes.
 .so lib/service.man
 .SS "Logging Options"
 .so lib/vlog.man
+.SS "Syncing Options"
+.so ovsdb/replication.man
 .SS "Public Key Infrastructure Options"
 The options described below for configuring the SSL public key
 infrastructure accept a special syntax for obtaining their

ovsdb/ovsdb-server.c

@@ -42,6 +42,7 @@
 #include "ovsdb-error.h"
 #include "poll-loop.h"
 #include "process.h"
+#include "replication.h"
 #include "row.h"
 #include "simap.h"
 #include "shash.h"
@@ -59,22 +60,17 @@
 
 VLOG_DEFINE_THIS_MODULE(ovsdb_server);
 
-struct db {
-    /* Initialized in main(). */
-    char *filename;
-    struct ovsdb_file *file;
-    struct ovsdb *db;
-
-    /* Only used by update_remote_status(). */
-    struct ovsdb_txn *txn;
-};
+struct db;
 
 /* SSL configuration. */
 static char *private_key_file;
 static char *certificate_file;
 static char *ca_cert_file;
 static bool bootstrap_ca_cert;
 
+/* Replication configuration. */
+static bool connect_to_remote_server;
+
 static unixctl_cb_func ovsdb_server_exit;
 static unixctl_cb_func ovsdb_server_compact;
 static unixctl_cb_func ovsdb_server_reconnect;
@@ -159,6 +155,10 @@ main_loop(struct ovsdb_jsonrpc_server *jsonrpc, struct shash *all_dbs,
         report_error_if_changed(reconfigure_ssl(all_dbs), &ssl_error);
         ovsdb_jsonrpc_server_run(jsonrpc);
 
+        if (connect_to_remote_server) {
+             replication_run(all_dbs);
+        }
+
         SHASH_FOR_EACH(node, all_dbs) {
             struct db *db = node->data;
             ovsdb_trigger_run(db->db, time_msec());
@@ -170,9 +170,9 @@ main_loop(struct ovsdb_jsonrpc_server *jsonrpc, struct shash *all_dbs,
             }
         }
 
-        /* update Manager status(es) every 5 seconds */
+        /* update Manager status(es) every 2.5 seconds */
         if (time_msec() >= status_timer) {
-            status_timer = time_msec() + 5000;
+            status_timer = time_msec() + 2500;
             update_remote_status(jsonrpc, remotes, all_dbs);
         }
 
@@ -351,6 +351,7 @@ main(int argc, char *argv[])
     sset_destroy(&remotes);
     sset_destroy(&db_filenames);
     unixctl_server_destroy(unixctl);
+    disconnect_remote_server();
 
     if (run_process && process_exited(run_process)) {
         int status = process_status(run_process);
@@ -434,21 +435,6 @@ open_db(struct server_config *config, const char *filename)
     return error;
 }
 
-static const struct db *
-find_db(const struct shash *all_dbs, const char *db_name)
-{
-    struct shash_node *node;
-
-    SHASH_FOR_EACH(node, all_dbs) {
-        struct db *db = node->data;
-        if (!strcmp(db->db->schema->name, db_name)) {
-            return db;
-        }
-    }
-
-    return NULL;
-}
-
 static char * OVS_WARN_UNUSED_RESULT
 parse_db_column__(const struct shash *all_dbs,
                   const char *name_, char *name,
@@ -1279,6 +1265,7 @@ parse_options(int *argcp, char **argvp[],
         OPT_RUN,
         OPT_BOOTSTRAP_CA_CERT,
         OPT_PEER_CA_CERT,
+        OPT_SYNC_FROM,
         VLOG_OPTION_ENUMS,
         DAEMON_OPTION_ENUMS
     };
@@ -1297,6 +1284,7 @@ parse_options(int *argcp, char **argvp[],
         {"private-key", required_argument, NULL, 'p'},
         {"certificate", required_argument, NULL, 'c'},
         {"ca-cert",     required_argument, NULL, 'C'},
+        {"sync-from",   required_argument, NULL, OPT_SYNC_FROM},
         {NULL, 0, NULL, 0},
     };
     char *short_options = ovs_cmdl_long_options_to_short_options(long_options);
@@ -1357,6 +1345,11 @@ parse_options(int *argcp, char **argvp[],
             stream_ssl_set_peer_ca_cert_file(optarg);
             break;
 
+        case OPT_SYNC_FROM:
+            set_remote_ovsdb_server(optarg);
+            connect_to_remote_server = true;
+            break;
+
         case '?':
             exit(EXIT_FAILURE);
 
@@ -1383,6 +1376,7 @@ usage(void)
     stream_usage("JSON-RPC", true, true, true);
     daemon_usage();
     vlog_usage();
+    replication_usage();
     printf("\nOther options:\n"
            "  --run COMMAND           run COMMAND as subprocess then exit\n"
            "  --unixctl=SOCKET        override default control socket name\n"

ovsdb/replication-syn.man

@@ -0,0 +1,2 @@
+.IP "Syncing options:"
+[\fB\-\-sync\-from=\fIserver\fR]