#include "row.h"
#include "stream-ssl.h"
#include "stream.h"
+#include "stress.h"
#include "svec.h"
#include "table.h"
#include "timeval.h"
#include "trigger.h"
#include "util.h"
#include "unixctl.h"
-
#include "vlog.h"
-#define THIS_MODULE VLM_ovsdb_server
+VLOG_DEFINE_THIS_MODULE(ovsdb_server);
+
+#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 shash *remotes, char **unixctl_pathp,
proctitle_init(argc, argv);
set_program_name(argv[0]);
- time_init();
- vlog_init();
+ stress_init_command();
signal(SIGPIPE, SIG_IGN);
process_init();
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) {
if (run_process) {
process_wait(run_process);
}
+ if (exiting) {
+ poll_immediate_wake();
+ }
poll_block();
}
ovsdb_jsonrpc_server_destroy(jsonrpc);
}
static void
-parse_db_string_column(const struct ovsdb *db,
- const char *name_,
- const struct ovsdb_table **tablep,
- const struct ovsdb_column **columnp)
+parse_db_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;
}
free(name);
+ *columnp = column;
+ *tablep = table;
+}
+
+static void
+parse_db_string_column(const struct ovsdb *db,
+ const char *name,
+ const struct ovsdb_table **tablep,
+ const struct ovsdb_column **columnp)
+{
+ const struct ovsdb_column *column;
+ const struct ovsdb_table *table;
+
+ parse_db_column(db, name, &table, &column);
+
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);
+ 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)
{
parse_db_string_column(db, name, &table, &column);
- HMAP_FOR_EACH (row, struct ovsdb_row, hmap_node, &table->rows) {
+ HMAP_FOR_EACH (row, hmap_node, &table->rows) {
const struct ovsdb_datum *datum;
size_t i;
return NULL;
}
}
+#endif /* HAVE_OPENSSL */
+
+static struct ovsdb_jsonrpc_options *
+add_remote(struct shash *remotes, const char *target)
+{
+ struct ovsdb_jsonrpc_options *options;
+
+ options = shash_find_data(remotes, target);
+ if (!options) {
+ options = ovsdb_jsonrpc_default_options();
+ shash_add(remotes, target, options);
+ }
+
+ return options;
+}
+
+static const union ovsdb_atom *
+read_column(const struct ovsdb_row *row, const char *column_name,
+ enum ovsdb_atomic_type type)
+{
+ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
+ const struct ovsdb_table_schema *schema = row->table->schema;
+ const struct ovsdb_column *column;
+ const struct ovsdb_datum *datum;
+
+ column = ovsdb_table_schema_get_column(schema, column_name);
+ if (!column) {
+ VLOG_DBG_RL(&rl, "Table `%s' has no `%s' column",
+ schema->name, column_name);
+ return false;
+ }
+
+ if (column->type.key.type != type
+ || column->type.value.type != OVSDB_TYPE_VOID
+ || column->type.n_max != 1) {
+ if (!VLOG_DROP_DBG(&rl)) {
+ char *type_name = ovsdb_type_to_english(&column->type);
+ VLOG_DBG("Table `%s' column `%s' has type %s, not expected "
+ "type %s.", schema->name, column_name, type_name,
+ ovsdb_atomic_type_to_string(type));
+ }
+ return false;
+ }
+
+ datum = &row->fields[column->index];
+ return datum->n ? datum->keys : NULL;
+}
+
+static bool
+read_integer_column(const struct ovsdb_row *row, const char *column_name,
+ long long int *integerp)
+{
+ const union ovsdb_atom *atom;
+
+ atom = read_column(row, column_name, OVSDB_TYPE_INTEGER);
+ *integerp = atom ? atom->integer : 0;
+ return atom != NULL;
+}
+
+static bool
+read_string_column(const struct ovsdb_row *row, const char *column_name,
+ const char **stringp)
+{
+ const union ovsdb_atom *atom;
+
+ atom = read_column(row, column_name, OVSDB_TYPE_STRING);
+ *stringp = atom ? atom->string : 0;
+ return atom != NULL;
+}
+
+/* Adds a remote and options to 'remotes', based on the Manager table row in
+ * 'row'. */
+static void
+add_manager_options(struct shash *remotes, const struct ovsdb_row *row)
+{
+ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
+ struct ovsdb_jsonrpc_options *options;
+ long long int max_backoff, probe_interval;
+ const char *target;
+
+ if (!read_string_column(row, "target", &target) || !target) {
+ VLOG_INFO_RL(&rl, "Table `%s' has missing or invalid `target' column",
+ row->table->schema->name);
+ return;
+ }
+
+ options = add_remote(remotes, target);
+ if (read_integer_column(row, "max_backoff", &max_backoff)) {
+ options->max_backoff = max_backoff;
+ }
+ if (read_integer_column(row, "probe_interval", &probe_interval)) {
+ options->probe_interval = probe_interval;
+ }
+}
static void
query_db_remotes(const char *name, const struct ovsdb *db,
const struct ovsdb_table *table;
const struct ovsdb_row *row;
- parse_db_string_column(db, name, &table, &column);
+ parse_db_column(db, name, &table, &column);
- HMAP_FOR_EACH (row, struct ovsdb_row, hmap_node, &table->rows) {
- const struct ovsdb_datum *datum;
- size_t i;
+ if (column->type.key.type == OVSDB_TYPE_STRING
+ && column->type.value.type == OVSDB_TYPE_VOID) {
+ HMAP_FOR_EACH (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);
+ datum = &row->fields[column->index];
+ for (i = 0; i < datum->n; i++) {
+ add_remote(remotes, datum->keys[i].string);
+ }
+ }
+ } else if (column->type.key.type == OVSDB_TYPE_UUID
+ && column->type.key.u.uuid.refTable
+ && column->type.value.type == OVSDB_TYPE_VOID) {
+ const struct ovsdb_table *ref_table = column->type.key.u.uuid.refTable;
+ HMAP_FOR_EACH (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++) {
+ const struct ovsdb_row *ref_row;
+
+ ref_row = ovsdb_table_get_row(ref_table, &datum->keys[i].uuid);
+ if (ref_row) {
+ add_manager_options(remotes, ref_row);
+ }
+ }
}
}
}
if (!strncmp(name, "db:", 3)) {
query_db_remotes(name, db, &resolved_remotes);
} else {
- shash_add_once(&resolved_remotes, name, NULL);
+ add_remote(&resolved_remotes, name);
}
}
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_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),
bootstrap_ca_cert);
+#endif
}
static void
}
}
+/* "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 shash *remotes, char **unixctl_pathp,
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();
git://git.onelab.eu / sliver-openvswitch.git / blobdiff