Merge "next" branch into "master".

[sliver-openvswitch.git] / ovsdb / ovsdb-server.c

diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index 02700df..ac3ae4a 100644 (file)
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -25,7 +25,6 @@
 #include "column.h"
 #include "command-line.h"
 #include "daemon.h"
-#include "fault.h"
 #include "file.h"
 #include "json.h"
 #include "jsonrpc.h"
@@ -53,7 +52,8 @@
 static unixctl_cb_func ovsdb_server_exit;
 
 static void parse_options(int argc, char *argv[], char **file_namep,
-                          struct shash *remotes, char **unixctl_pathp);
+                          struct shash *remotes, char **unixctl_pathp,
+                          char **run_command);
 static void usage(void) NO_RETURN;
 
 static void set_remotes(struct ovsdb_jsonrpc_server *jsonrpc,
@@ -63,23 +63,26 @@ int
 main(int argc, char *argv[])
 {
     char *unixctl_path = NULL;
+    char *run_command = NULL;
     struct unixctl_server *unixctl;
     struct ovsdb_jsonrpc_server *jsonrpc;
     struct shash remotes;
     struct ovsdb_error *error;
     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, &remotes, &unixctl_path);
+    parse_options(argc, argv, &file_name, &remotes, &unixctl_path,
+                  &run_command);
 
     die_if_already_running();
     daemonize_start();
@@ -94,7 +97,23 @@ main(int argc, char *argv[])
 
     retval = unixctl_server_create(unixctl_path, &unixctl);
     if (retval) {
-        ovs_fatal(retval, "could not listen for control connections");
+        exit(EXIT_FAILURE);
+    }
+
+    if (run_command) {
+        char *run_argv[4];
+
+        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;
     }
 
     daemonize_complete();
@@ -107,12 +126,30 @@ main(int argc, char *argv[])
         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;
 }
@@ -121,14 +158,14 @@ static void
 query_db_remotes(const char *name_, const struct ovsdb *db,
                  struct shash *remotes)
 {
-    char *name, *db_prefix, *table_name, *column_name;
+    char *name, *table_name, *column_name;
     const struct ovsdb_column *column;
     const struct ovsdb_table *table;
     const struct ovsdb_row *row;
     char *save_ptr = NULL;
 
     name = xstrdup(name_);
-    db_prefix = strtok_r(name, ":", &save_ptr);
+    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) {
@@ -146,8 +183,8 @@ query_db_remotes(const char *name_, const struct ovsdb *db,
                   name_, table_name, column_name);
     }
 
-    if (column->type.key_type != OVSDB_TYPE_STRING
-        || column->type.value_type != OVSDB_TYPE_VOID) {
+    if (column->type.key.type != OVSDB_TYPE_STRING
+        || column->type.value.type != OVSDB_TYPE_VOID) {
         ovs_fatal(0, "remote \"%s\": type of table \"%s\" column \"%s\" is "
                   "not string or set of strings",
                   name_, table_name, column_name);
@@ -189,7 +226,7 @@ set_remotes(struct ovsdb_jsonrpc_server *jsonrpc,
 
 
 static void
-ovsdb_server_exit(struct unixctl_conn *conn, const char *args UNUSED,
+ovsdb_server_exit(struct unixctl_conn *conn, const char *args OVS_UNUSED,
                   void *exiting_)
 {
     bool *exiting = exiting_;
@@ -199,12 +236,14 @@ ovsdb_server_exit(struct unixctl_conn *conn, const char *args UNUSED,
 
 static void
 parse_options(int argc, char *argv[], char **file_namep,
-              struct shash *remotes, char **unixctl_pathp)
+              struct shash *remotes, char **unixctl_pathp,
+              char **run_command)
 {
     enum {
         OPT_DUMMY = UCHAR_MAX + 1,
         OPT_REMOTE,
         OPT_UNIXCTL,
+        OPT_RUN,
         OPT_BOOTSTRAP_CA_CERT,
         VLOG_OPTION_ENUMS,
         LEAK_CHECKER_OPTION_ENUMS
@@ -212,6 +251,7 @@ parse_options(int argc, char *argv[], char **file_namep,
     static struct option long_options[] = {
         {"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,
@@ -243,6 +283,10 @@ parse_options(int argc, char *argv[], char **file_namep,
             *unixctl_pathp = optarg;
             break;
 
+        case OPT_RUN:
+            *run_command = optarg;
+            break;
+
         case 'h':
             usage();
 
@@ -298,6 +342,7 @@ usage(void)
     daemon_usage();
     vlog_usage();
     printf("\nOther options:\n"
+           "  --run COMMAND           run COMMAND as subprocess then exit\n"
            "  -h, --help              display this help message\n"
            "  -V, --version           display version information\n");
     leak_checker_usage();