#include <config.h>
-#include <assert.h>
#include <errno.h>
#include <getopt.h>
#include <signal.h>
#include "command-line.h"
#include "daemon.h"
#include "dirs.h"
+#include "dummy.h"
+#include "dynamic-string.h"
#include "file.h"
#include "hash.h"
#include "json.h"
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;
+};
+
/* SSL configuration. */
static char *private_key_file;
static char *certificate_file;
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,
+static void parse_options(int *argc, char **argvp[],
struct sset *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 sset *remotes);
+ const struct db dbs[], size_t n_dbs,
+ struct sset *remotes);
static void update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc,
const struct sset *remotes,
- struct ovsdb *db);
+ struct db dbs[], size_t n_dbs);
int
main(int argc, char *argv[])
struct unixctl_server *unixctl;
struct ovsdb_jsonrpc_server *jsonrpc;
struct sset remotes;
- struct ovsdb_error *error;
- struct ovsdb_file *file;
- struct ovsdb *db;
struct process *run_process;
- char *file_name;
bool exiting;
int retval;
long long int status_timer = LLONG_MIN;
+ struct db *dbs;
+ int n_dbs;
+ int i;
+
proctitle_init(argc, argv);
set_program_name(argv[0]);
stress_init_command();
signal(SIGPIPE, SIG_IGN);
process_init();
- parse_options(argc, argv, &file_name, &remotes, &unixctl_path,
- &run_command);
+ parse_options(&argc, &argv, &remotes, &unixctl_path, &run_command);
daemonize_start();
- error = ovsdb_file_open(file_name, false, &db, &file);
- if (error) {
- ovs_fatal(0, "%s", ovsdb_error_to_string(error));
+ n_dbs = MAX(1, argc);
+ dbs = xcalloc(n_dbs + 1, sizeof *dbs);
+ if (argc > 0) {
+ for (i = 0; i < argc; i++) {
+ dbs[i].filename = argv[i];
+ }
+ } else {
+ dbs[0].filename = xasprintf("%s/conf.db", ovs_dbdir());
}
- free(file_name);
- jsonrpc = ovsdb_jsonrpc_server_create(db);
- reconfigure_from_db(jsonrpc, db, &remotes);
+ for (i = 0; i < n_dbs; i++) {
+ struct ovsdb_error *error;
+
+ error = ovsdb_file_open(dbs[i].filename, false,
+ &dbs[i].db, &dbs[i].file);
+ if (error) {
+ ovs_fatal(0, "%s", ovsdb_error_to_string(error));
+ }
+ }
+
+ jsonrpc = ovsdb_jsonrpc_server_create();
+ for (i = 0; i < n_dbs; i++) {
+ if (!ovsdb_jsonrpc_server_add_db(jsonrpc, dbs[i].db)) {
+ ovs_fatal(0, "%s: duplicate database name",
+ dbs[i].db->schema->name);
+ }
+ }
+ reconfigure_from_db(jsonrpc, dbs, n_dbs, &remotes);
retval = unixctl_server_create(unixctl_path, &unixctl);
if (retval) {
}
unixctl_command_register("exit", "", 0, 0, ovsdb_server_exit, &exiting);
- unixctl_command_register("ovsdb-server/compact", "", 0, 0,
- ovsdb_server_compact, file);
+ unixctl_command_register("ovsdb-server/compact", "", 0, 1,
+ ovsdb_server_compact, dbs);
unixctl_command_register("ovsdb-server/reconnect", "", 0, 0,
ovsdb_server_reconnect, jsonrpc);
exiting = false;
while (!exiting) {
+ int i;
+
memory_run();
if (memory_should_report()) {
struct simap usage;
simap_init(&usage);
ovsdb_jsonrpc_server_get_memory_usage(jsonrpc, &usage);
- ovsdb_get_memory_usage(db, &usage);
+ for (i = 0; i < n_dbs; i++) {
+ ovsdb_get_memory_usage(dbs[i].db, &usage);
+ }
memory_report(&usage);
simap_destroy(&usage);
}
- reconfigure_from_db(jsonrpc, db, &remotes);
+ reconfigure_from_db(jsonrpc, dbs, n_dbs, &remotes);
ovsdb_jsonrpc_server_run(jsonrpc);
unixctl_server_run(unixctl);
- ovsdb_trigger_run(db, time_msec());
+
+ for (i = 0; i < n_dbs; i++) {
+ ovsdb_trigger_run(dbs[i].db, time_msec());
+ }
if (run_process && process_exited(run_process)) {
exiting = true;
}
/* update Manager status(es) every 5 seconds */
if (time_msec() >= status_timer) {
status_timer = time_msec() + 5000;
- update_remote_status(jsonrpc, &remotes, db);
+ update_remote_status(jsonrpc, &remotes, dbs, n_dbs);
}
memory_wait();
ovsdb_jsonrpc_server_wait(jsonrpc);
unixctl_server_wait(unixctl);
- ovsdb_trigger_wait(db, time_msec());
+ for (i = 0; i < n_dbs; i++) {
+ ovsdb_trigger_wait(dbs[i].db, time_msec());
+ }
if (run_process) {
process_wait(run_process);
}
poll_block();
}
ovsdb_jsonrpc_server_destroy(jsonrpc);
- ovsdb_destroy(db);
+ for (i = 0; i < n_dbs; i++) {
+ ovsdb_destroy(dbs[i].db);
+ }
sset_destroy(&remotes);
unixctl_server_destroy(unixctl);
return 0;
}
+static const struct db *
+find_db(const struct db dbs[], size_t n_dbs, const char *db_name)
+{
+ size_t i;
+
+ for (i = 0; i < n_dbs; i++) {
+ if (!strcmp(dbs[i].db->schema->name, db_name)) {
+ return &dbs[i];
+ }
+ }
+
+ return NULL;
+}
+
static void
-parse_db_column(const struct ovsdb *db,
+parse_db_column(const struct db dbs[], size_t n_dbs,
const char *name_,
+ const struct db **dbp,
const struct ovsdb_table **tablep,
const struct ovsdb_column **columnp)
{
- char *name, *table_name, *column_name;
+ const char *table_name, *column_name;
const struct ovsdb_column *column;
const struct ovsdb_table *table;
+ const char *tokens[3];
char *save_ptr = NULL;
+ const struct db *db;
+ char *name;
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) {
+ tokens[0] = strtok_r(NULL, ",", &save_ptr);
+ tokens[1] = strtok_r(NULL, ",", &save_ptr);
+ tokens[2] = strtok_r(NULL, ",", &save_ptr);
+ if (!tokens[0] || !tokens[1]) {
ovs_fatal(0, "\"%s\": invalid syntax", name_);
}
+ if (tokens[2]) {
+ const char *db_name = tokens[0];
+ table_name = tokens[1];
+ column_name = tokens[2];
+
+ db = find_db(dbs, n_dbs, tokens[0]);
+ if (!db) {
+ ovs_fatal(0, "\"%s\": no database named %s", name_, db_name);
+ }
+ } else {
+ if (n_dbs > 1) {
+ ovs_fatal(0, "\"%s\": database name must be specified (because "
+ "multiple databases are configured)", name_);
+ }
+
+ table_name = tokens[0];
+ column_name = tokens[1];
+ db = &dbs[0];
+ }
- table = ovsdb_get_table(db, table_name);
+ table = ovsdb_get_table(db->db, table_name);
if (!table) {
ovs_fatal(0, "\"%s\": no table named %s", name_, table_name);
}
}
free(name);
+ *dbp = db;
*columnp = column;
*tablep = table;
}
static void
-parse_db_string_column(const struct ovsdb *db,
+parse_db_string_column(const struct db dbs[], size_t n_dbs,
const char *name,
+ const struct db **dbp,
const struct ovsdb_table **tablep,
const struct ovsdb_column **columnp)
{
const struct ovsdb_column *column;
const struct ovsdb_table *table;
+ const struct db *db;
- parse_db_column(db, name, &table, &column);
+ parse_db_column(dbs, n_dbs, name, &db, &table, &column);
if (column->type.key.type != OVSDB_TYPE_STRING
|| column->type.value.type != OVSDB_TYPE_VOID) {
name, table->schema->name, column->name);
}
+ *dbp = db;
*columnp = column;
*tablep = table;
}
static OVS_UNUSED const char *
-query_db_string(const struct ovsdb *db, const char *name)
+query_db_string(const struct db dbs[], size_t n_dbs, const char *name)
{
if (!name || strncmp(name, "db:", 3)) {
return name;
const struct ovsdb_column *column;
const struct ovsdb_table *table;
const struct ovsdb_row *row;
+ const struct db *db;
- parse_db_string_column(db, name, &table, &column);
+ parse_db_string_column(dbs, n_dbs, name, &db, &table, &column);
HMAP_FOR_EACH (row, hmap_node, &table->rows) {
const struct ovsdb_datum *datum;
datum = get_datum(row, column_name, OVSDB_TYPE_STRING, OVSDB_TYPE_STRING,
UINT_MAX);
if (!datum) {
+ for (i = 0; i < n; i++) {
+ free(keys[i]);
+ free(values[i]);
+ }
return;
}
}
static void
-query_db_remotes(const char *name, const struct ovsdb *db,
+query_db_remotes(const char *name, const struct db dbs[], size_t n_dbs,
struct shash *remotes)
{
const struct ovsdb_column *column;
const struct ovsdb_table *table;
const struct ovsdb_row *row;
+ const struct db *db;
- parse_db_column(db, name, &table, &column);
+ parse_db_column(dbs, n_dbs, name, &db, &table, &column);
if (column->type.key.type == OVSDB_TYPE_STRING
&& column->type.value.type == OVSDB_TYPE_VOID) {
}
static void
-update_remote_rows(const struct ovsdb *db, struct ovsdb_txn *txn,
+update_remote_rows(const struct db dbs[], size_t n_dbs,
const char *remote_name,
const struct ovsdb_jsonrpc_server *jsonrpc)
{
const struct ovsdb_table *table, *ref_table;
const struct ovsdb_column *column;
const struct ovsdb_row *row;
+ const struct db *db;
if (strncmp("db:", remote_name, 3)) {
return;
}
- parse_db_column(db, remote_name, &table, &column);
+ parse_db_column(dbs, n_dbs, remote_name, &db, &table, &column);
if (column->type.key.type != OVSDB_TYPE_UUID
|| !column->type.key.u.uuid.refTable
ref_row = ovsdb_table_get_row(ref_table, &datum->keys[i].uuid);
if (ref_row) {
- update_remote_row(ref_row, txn, jsonrpc);
+ update_remote_row(ref_row, db->txn, jsonrpc);
}
}
}
static void
update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc,
- const struct sset *remotes, struct ovsdb *db)
+ const struct sset *remotes,
+ struct db dbs[], size_t n_dbs)
{
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
- struct ovsdb_txn *txn;
- const bool durable_txn = false;
- struct ovsdb_error *error;
const char *remote;
+ size_t i;
- txn = ovsdb_txn_create(db);
+ for (i = 0; i < n_dbs; i++) {
+ dbs[i].txn = ovsdb_txn_create(dbs[i].db);
+ }
/* Iterate over --remote arguments given on command line. */
SSET_FOR_EACH (remote, remotes) {
- update_remote_rows(db, txn, remote, jsonrpc);
+ update_remote_rows(dbs, n_dbs, remote, jsonrpc);
}
- error = ovsdb_txn_commit(txn, durable_txn);
- if (error) {
- VLOG_ERR_RL(&rl, "Failed to update remote status: %s",
- ovsdb_error_to_string(error));
+ for (i = 0; i < n_dbs; i++) {
+ struct ovsdb_error *error = ovsdb_txn_commit(dbs[i].txn, false);
+ if (error) {
+ VLOG_ERR_RL(&rl, "Failed to update remote status: %s",
+ ovsdb_error_to_string(error));
+ ovsdb_error_destroy(error);
+ }
}
}
/* Reconfigures ovsdb-server based on information in the database. */
static void
reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc,
- const struct ovsdb *db, struct sset *remotes)
+ const struct db dbs[], size_t n_dbs, struct sset *remotes)
{
struct shash resolved_remotes;
const char *name;
shash_init(&resolved_remotes);
SSET_FOR_EACH (name, remotes) {
if (!strncmp(name, "db:", 3)) {
- query_db_remotes(name, db, &resolved_remotes);
+ query_db_remotes(name, dbs, n_dbs, &resolved_remotes);
} else {
add_remote(&resolved_remotes, name);
}
shash_destroy_free_data(&resolved_remotes);
/* Configure SSL. */
- stream_ssl_set_key_and_cert(query_db_string(db, private_key_file),
- query_db_string(db, certificate_file));
- stream_ssl_set_ca_cert_file(query_db_string(db, ca_cert_file),
+ stream_ssl_set_key_and_cert(query_db_string(dbs, n_dbs, private_key_file),
+ query_db_string(dbs, n_dbs, certificate_file));
+ stream_ssl_set_ca_cert_file(query_db_string(dbs, n_dbs, ca_cert_file),
bootstrap_ca_cert);
}
}
static void
-ovsdb_server_compact(struct unixctl_conn *conn, int argc OVS_UNUSED,
- const char *argv[] OVS_UNUSED, void *file_)
+ovsdb_server_compact(struct unixctl_conn *conn, int argc,
+ const char *argv[], void *dbs_)
{
- struct ovsdb_file *file = file_;
- struct ovsdb_error *error;
+ struct db *dbs = dbs_;
+ struct ds reply;
+ struct db *db;
+ int n = 0;
- VLOG_INFO("compacting database by user request");
- error = ovsdb_file_compact(file);
- if (!error) {
- unixctl_command_reply(conn, NULL);
+ ds_init(&reply);
+ for (db = dbs; db->filename != NULL; db++) {
+ const char *name = db->db->schema->name;
+
+ if (argc < 2 || !strcmp(argv[1], name)) {
+ struct ovsdb_error *error;
+
+ VLOG_INFO("compacting %s database by user request", name);
+
+ error = ovsdb_file_compact(db->file);
+ if (error) {
+ char *s = ovsdb_error_to_string(error);
+ ds_put_format(&reply, "%s\n", s);
+ free(s);
+ }
+
+ n++;
+ }
+ }
+
+ if (!n) {
+ unixctl_command_reply_error(conn, "no database by that name");
+ } else if (reply.length) {
+ unixctl_command_reply_error(conn, ds_cstr(&reply));
} else {
- char *s = ovsdb_error_to_string(error);
- ovsdb_error_destroy(error);
- unixctl_command_reply_error(conn, s);
- free(s);
+ unixctl_command_reply(conn, NULL);
}
+ ds_destroy(&reply);
}
/* "ovsdb-server/reconnect": makes ovsdb-server drop all of its JSON-RPC
}
static void
-parse_options(int argc, char *argv[], char **file_namep,
- struct sset *remotes, char **unixctl_pathp,
- char **run_command)
+parse_options(int *argcp, char **argvp[],
+ struct sset *remotes, char **unixctl_pathp, char **run_command)
{
enum {
- OPT_DUMMY = UCHAR_MAX + 1,
- OPT_REMOTE,
+ OPT_REMOTE = UCHAR_MAX + 1,
OPT_UNIXCTL,
OPT_RUN,
OPT_BOOTSTRAP_CA_CERT,
+ OPT_ENABLE_DUMMY,
VLOG_OPTION_ENUMS,
LEAK_CHECKER_OPTION_ENUMS,
DAEMON_OPTION_ENUMS
{"private-key", required_argument, NULL, 'p'},
{"certificate", required_argument, NULL, 'c'},
{"ca-cert", required_argument, NULL, 'C'},
+ {"enable-dummy", optional_argument, NULL, OPT_ENABLE_DUMMY},
{NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
+ int argc = *argcp;
+ char **argv = *argvp;
sset_init(remotes);
for (;;) {
bootstrap_ca_cert = true;
break;
+ case OPT_ENABLE_DUMMY:
+ dummy_enable(optarg && !strcmp(optarg, "override"));
+ break;
+
case '?':
exit(EXIT_FAILURE);
}
free(short_options);
- argc -= optind;
- argv += optind;
-
- switch (argc) {
- case 0:
- *file_namep = xasprintf("%s/conf.db", ovs_dbdir());
- break;
-
- case 1:
- *file_namep = xstrdup(argv[0]);
- break;
-
- default:
- ovs_fatal(0, "database file is only non-option argument; "
- "use --help for usage");
- }
+ *argcp -= optind;
+ *argvp += optind;
}
static void
usage(void)
{
printf("%s: Open vSwitch database server\n"
- "usage: %s [OPTIONS] DATABASE\n"
- "where DATABASE is a database file in ovsdb format.\n",
- program_name, program_name);
+ "usage: %s [OPTIONS] [DATABASE...]\n"
+ "where each DATABASE is a database file in ovsdb format.\n"
+ "The default DATABASE, if none is given, is\n%s/conf.db.\n",
+ program_name, program_name, ovs_dbdir());
printf("\nJSON-RPC options (may be specified any number of times):\n"
" --remote=REMOTE connect or listen to REMOTE\n");
stream_usage("JSON-RPC", true, true, true);