X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb-server.c;h=df523b03ba164f9bfca00fa5b8963bc1f3d6f6d2;hb=ff8bb7e76b2cdcbcf88cd2fac663ba517e4a659c;hp=a91e77893db470b2d656163471819de2713600d3;hpb=bd06962ad334fa4631b67905fc9f43f96a908915;p=sliver-openvswitch.git

diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index a91e77893..df523b03b 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 2009, 2010 Nicira Networks
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,21 +20,27 @@
 #include <errno.h>
 #include <getopt.h>
 #include <signal.h>
+#include <unistd.h>
 
+#include "column.h"
 #include "command-line.h"
 #include "daemon.h"
-#include "fault.h"
 #include "file.h"
 #include "json.h"
 #include "jsonrpc.h"
 #include "jsonrpc-server.h"
 #include "leak-checker.h"
 #include "list.h"
+#include "ovsdb-data.h"
+#include "ovsdb-types.h"
 #include "ovsdb-error.h"
 #include "poll-loop.h"
 #include "process.h"
+#include "row.h"
+#include "stream-ssl.h"
 #include "stream.h"
 #include "svec.h"
+#include "table.h"
 #include "timeval.h"
 #include "trigger.h"
 #include "util.h"
@@ -43,91 +49,322 @@
 #include "vlog.h"
 #define THIS_MODULE VLM_ovsdb_server
 
-static const struct jsonrpc_server_cbs ovsdb_jsonrpc_cbs;
+#if HAVE_OPENSSL
+/* SSL configuration. */
+static char *private_key_file;
+static char *certificate_file;
+static char *ca_cert_file;
+static bool bootstrap_ca_cert;
+#endif
+
+static unixctl_cb_func ovsdb_server_exit;
+static unixctl_cb_func ovsdb_server_compact;
+static unixctl_cb_func ovsdb_server_reconnect;
 
 static void parse_options(int argc, char *argv[], char **file_namep,
-                          struct svec *active, struct svec *passive);
+                          struct shash *remotes, char **unixctl_pathp,
+                          char **run_command);
 static void usage(void) NO_RETURN;
 
+static void reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc,
+                                const struct ovsdb *db, struct shash *remotes);
+
 int
 main(int argc, char *argv[])
 {
+    char *unixctl_path = NULL;
+    char *run_command = NULL;
     struct unixctl_server *unixctl;
     struct ovsdb_jsonrpc_server *jsonrpc;
-    struct svec active, passive;
+    struct shash remotes;
     struct ovsdb_error *error;
+    struct ovsdb_file *file;
     struct ovsdb *db;
+    struct process *run_process;
     char *file_name;
+    bool exiting;
     int retval;
 
+    proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    register_fault_handlers();
-    time_init();
     vlog_init();
     signal(SIGPIPE, SIG_IGN);
     process_init();
 
-    parse_options(argc, argv, &file_name, &active, &passive);
+    parse_options(argc, argv, &file_name, &remotes, &unixctl_path,
+                  &run_command);
+
+    die_if_already_running();
+    daemonize_start();
 
-    error = ovsdb_file_open(file_name, false, &db);
+    error = ovsdb_file_open(file_name, false, &db, &file);
     if (error) {
         ovs_fatal(0, "%s", ovsdb_error_to_string(error));
     }
 
-    retval = ovsdb_jsonrpc_server_create(db, &active, &passive, &jsonrpc);
+    jsonrpc = ovsdb_jsonrpc_server_create(db);
+    reconfigure_from_db(jsonrpc, db, &remotes);
+
+    retval = unixctl_server_create(unixctl_path, &unixctl);
     if (retval) {
-        ovs_fatal(retval, "failed to initialize JSON-RPC server for OVSDB");
+        exit(EXIT_FAILURE);
     }
-    svec_destroy(&active);
-    svec_destroy(&passive);
 
-    die_if_already_running();
-    daemonize();
+    if (run_command) {
+        char *run_argv[4];
 
-    retval = unixctl_server_create(NULL, &unixctl);
-    if (retval) {
-        ovs_fatal(retval, "could not listen for control connections");
+        run_argv[0] = "/bin/sh";
+        run_argv[1] = "-c";
+        run_argv[2] = run_command;
+        run_argv[3] = NULL;
+
+        retval = process_start(run_argv, NULL, 0, NULL, 0, &run_process);
+        if (retval) {
+            ovs_fatal(retval, "%s: process failed to start", run_command);
+        }
+    } else {
+        run_process = NULL;
     }
 
-    for (;;) {
+    daemonize_complete();
+
+    unixctl_command_register("exit", ovsdb_server_exit, &exiting);
+    unixctl_command_register("ovsdb-server/compact", ovsdb_server_compact,
+                             file);
+    unixctl_command_register("ovsdb-server/reconnect", ovsdb_server_reconnect,
+                             jsonrpc);
+
+    exiting = false;
+    while (!exiting) {
+        reconfigure_from_db(jsonrpc, db, &remotes);
         ovsdb_jsonrpc_server_run(jsonrpc);
         unixctl_server_run(unixctl);
         ovsdb_trigger_run(db, time_msec());
+        if (run_process && process_exited(run_process)) {
+            exiting = true;
+        }
 
         ovsdb_jsonrpc_server_wait(jsonrpc);
         unixctl_server_wait(unixctl);
         ovsdb_trigger_wait(db, time_msec());
+        if (run_process) {
+            process_wait(run_process);
+        }
         poll_block();
     }
+    ovsdb_jsonrpc_server_destroy(jsonrpc);
+    ovsdb_destroy(db);
+    shash_destroy(&remotes);
+    unixctl_server_destroy(unixctl);
+
+    if (run_process && process_exited(run_process)) {
+        int status = process_status(run_process);
+        if (status) {
+            ovs_fatal(0, "%s: child exited, %s",
+                      run_command, process_status_msg(status));
+        }
+    }
 
     return 0;
 }
 
+static void
+parse_db_string_column(const struct ovsdb *db,
+                       const char *name_,
+                       const struct ovsdb_table **tablep,
+                       const struct ovsdb_column **columnp)
+{
+    char *name, *table_name, *column_name;
+    const struct ovsdb_column *column;
+    const struct ovsdb_table *table;
+    char *save_ptr = NULL;
+
+    name = xstrdup(name_);
+    strtok_r(name, ":", &save_ptr); /* "db:" */
+    table_name = strtok_r(NULL, ",", &save_ptr);
+    column_name = strtok_r(NULL, ",", &save_ptr);
+    if (!table_name || !column_name) {
+        ovs_fatal(0, "\"%s\": invalid syntax", name_);
+    }
+
+    table = ovsdb_get_table(db, table_name);
+    if (!table) {
+        ovs_fatal(0, "\"%s\": no table named %s", name_, table_name);
+    }
+
+    column = ovsdb_table_schema_get_column(table->schema, column_name);
+    if (!column) {
+        ovs_fatal(0, "\"%s\": table \"%s\" has no column \"%s\"",
+                  name_, table_name, column_name);
+    }
+    free(name);
+
+    if (column->type.key.type != OVSDB_TYPE_STRING
+        || column->type.value.type != OVSDB_TYPE_VOID) {
+        ovs_fatal(0, "\"%s\": table \"%s\" column \"%s\" is "
+                  "not string or set of strings",
+                  name_, table->schema->name, column->name);
+    }
+
+    *columnp = column;
+    *tablep = table;
+}
+
+#if HAVE_OPENSSL
+static const char *
+query_db_string(const struct ovsdb *db, const char *name)
+{
+    if (!name || strncmp(name, "db:", 3)) {
+        return name;
+    } else {
+        const struct ovsdb_column *column;
+        const struct ovsdb_table *table;
+        const struct ovsdb_row *row;
+
+        parse_db_string_column(db, name, &table, &column);
+
+        HMAP_FOR_EACH (row, struct ovsdb_row, hmap_node, &table->rows) {
+            const struct ovsdb_datum *datum;
+            size_t i;
+
+            datum = &row->fields[column->index];
+            for (i = 0; i < datum->n; i++) {
+                if (datum->keys[i].string[0]) {
+                    return datum->keys[i].string;
+                }
+            }
+        }
+        return NULL;
+    }
+}
+#endif /* HAVE_OPENSSL */
+
+static void
+query_db_remotes(const char *name, const struct ovsdb *db,
+                 struct shash *remotes)
+{
+    const struct ovsdb_column *column;
+    const struct ovsdb_table *table;
+    const struct ovsdb_row *row;
+
+    parse_db_string_column(db, name, &table, &column);
+
+    HMAP_FOR_EACH (row, struct ovsdb_row, hmap_node, &table->rows) {
+        const struct ovsdb_datum *datum;
+        size_t i;
+
+        datum = &row->fields[column->index];
+        for (i = 0; i < datum->n; i++) {
+            shash_add_once(remotes, datum->keys[i].string, NULL);
+        }
+    }
+}
+
+/* Reconfigures ovsdb-server based on information in the database. */
+static void
+reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc,
+                    const struct ovsdb *db, struct shash *remotes)
+{
+    struct shash resolved_remotes;
+    struct shash_node *node;
+
+    /* Configure remotes. */
+    shash_init(&resolved_remotes);
+    SHASH_FOR_EACH (node, remotes) {
+        const char *name = node->name;
+
+        if (!strncmp(name, "db:", 3)) {
+            query_db_remotes(name, db, &resolved_remotes);
+        } else {
+            shash_add_once(&resolved_remotes, name, NULL);
+        }
+    }
+    ovsdb_jsonrpc_server_set_remotes(jsonrpc, &resolved_remotes);
+    shash_destroy(&resolved_remotes);
+
+#if HAVE_OPENSSL
+    /* Configure SSL. */
+    stream_ssl_set_private_key_file(query_db_string(db, private_key_file));
+    stream_ssl_set_certificate_file(query_db_string(db, certificate_file));
+    stream_ssl_set_ca_cert_file(query_db_string(db, ca_cert_file),
+                                bootstrap_ca_cert);
+#endif
+}
+
+static void
+ovsdb_server_exit(struct unixctl_conn *conn, const char *args OVS_UNUSED,
+                  void *exiting_)
+{
+    bool *exiting = exiting_;
+    *exiting = true;
+    unixctl_command_reply(conn, 200, NULL);
+}
+
+static void
+ovsdb_server_compact(struct unixctl_conn *conn, const char *args OVS_UNUSED,
+                     void *file_)
+{
+    struct ovsdb_file *file = file_;
+    struct ovsdb_error *error;
+
+    VLOG_INFO("compacting database by user request");
+    error = ovsdb_file_compact(file);
+    if (!error) {
+        unixctl_command_reply(conn, 200, NULL);
+    } else {
+        char *s = ovsdb_error_to_string(error);
+        ovsdb_error_destroy(error);
+        unixctl_command_reply(conn, 503, s);
+        free(s);
+    }
+}
+
+/* "ovsdb-server/reconnect": makes ovsdb-server drop all of its JSON-RPC
+ * connections and reconnect. */
+static void
+ovsdb_server_reconnect(struct unixctl_conn *conn, const char *args OVS_UNUSED,
+                       void *jsonrpc_)
+{
+    struct ovsdb_jsonrpc_server *jsonrpc = jsonrpc_;
+
+    ovsdb_jsonrpc_server_reconnect(jsonrpc);
+    unixctl_command_reply(conn, 200, NULL);
+}
+
 static void
 parse_options(int argc, char *argv[], char **file_namep,
-              struct svec *active, struct svec *passive)
+              struct shash *remotes, char **unixctl_pathp,
+              char **run_command)
 {
     enum {
         OPT_DUMMY = UCHAR_MAX + 1,
-        OPT_CONNECT,
-        OPT_LISTEN,
+        OPT_REMOTE,
+        OPT_UNIXCTL,
+        OPT_RUN,
+        OPT_BOOTSTRAP_CA_CERT,
         VLOG_OPTION_ENUMS,
         LEAK_CHECKER_OPTION_ENUMS
     };
     static struct option long_options[] = {
-        {"connect",     required_argument, 0, OPT_CONNECT},
-        {"listen",      required_argument, 0, OPT_LISTEN},
+        {"remote",      required_argument, 0, OPT_REMOTE},
+        {"unixctl",     required_argument, 0, OPT_UNIXCTL},
+        {"run",         required_argument, 0, OPT_RUN},
         {"help",        no_argument, 0, 'h'},
         {"version",     no_argument, 0, 'V'},
         DAEMON_LONG_OPTIONS,
         VLOG_LONG_OPTIONS,
         LEAK_CHECKER_LONG_OPTIONS,
+#ifdef HAVE_OPENSSL
+        {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
+        {"private-key", required_argument, 0, 'p'},
+        {"certificate", required_argument, 0, 'c'},
+        {"ca-cert",     required_argument, 0, 'C'},
+#endif
         {0, 0, 0, 0},
     };
     char *short_options = long_options_to_short_options(long_options);
 
-    svec_init(active);
-    svec_init(passive);
+    shash_init(remotes);
     for (;;) {
         int c;
 
@@ -137,12 +374,16 @@ parse_options(int argc, char *argv[], char **file_namep,
         }
 
         switch (c) {
-        case OPT_CONNECT:
-            svec_add(active, optarg);
+        case OPT_REMOTE:
+            shash_add_once(remotes, optarg, NULL);
             break;
 
-        case OPT_LISTEN:
-            svec_add(passive, optarg);
+        case OPT_UNIXCTL:
+            *unixctl_pathp = optarg;
+            break;
+
+        case OPT_RUN:
+            *run_command = optarg;
             break;
 
         case 'h':
@@ -156,6 +397,26 @@ parse_options(int argc, char *argv[], char **file_namep,
         DAEMON_OPTION_HANDLERS
         LEAK_CHECKER_OPTION_HANDLERS
 
+#ifdef HAVE_OPENSSL
+        case 'p':
+            private_key_file = optarg;
+            break;
+
+        case 'c':
+            certificate_file = optarg;
+            break;
+
+        case 'C':
+            ca_cert_file = optarg;
+            bootstrap_ca_cert = false;
+            break;
+
+        case OPT_BOOTSTRAP_CA_CERT:
+            ca_cert_file = optarg;
+            bootstrap_ca_cert = true;
+            break;
+#endif
+
         case '?':
             exit(EXIT_FAILURE);
 
@@ -168,9 +429,11 @@ parse_options(int argc, char *argv[], char **file_namep,
     argc -= optind;
     argv += optind;
 
-    if (argc != 1) {
+    if (argc > 1) {
         ovs_fatal(0, "database file is only non-option argument; "
                 "use --help for usage");
+    } else if (argc < 1) {
+        ovs_fatal(0, "missing database file argument; use --help for usage");
     }
 
     *file_namep = argv[0];
@@ -184,12 +447,13 @@ usage(void)
            "where DATABASE is a database file in ovsdb format.\n",
            program_name, program_name);
     printf("\nJSON-RPC options (may be specified any number of times):\n"
-           "  --connect=REMOTE        make active connection to REMOTE\n"
-           "  --listen=LOCAL          passively listen on LOCAL\n");
-    stream_usage("JSON-RPC", true, true);
+           "  --remote=REMOTE         connect or listen to REMOTE\n");
+    stream_usage("JSON-RPC", true, true, true);
     daemon_usage();
     vlog_usage();
     printf("\nOther options:\n"
+           "  --run COMMAND           run COMMAND as subprocess then exit\n"
+           "  --unixctl=SOCKET        override default control socket name\n"
            "  -h, --help              display this help message\n"
            "  -V, --version           display version information\n");
     leak_checker_usage();