/*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "daemon.h"
#include "dirs.h"
#include "dynamic-string.h"
+#include "fatal-signal.h"
#include "json.h"
#include "jsonrpc.h"
#include "lib/table.h"
#include "stream.h"
#include "stream-ssl.h"
#include "table.h"
+#include "monitor.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(ovsdb_client);
static const struct ovsdb_client_command *get_all_commands(void);
-static void usage(void) NO_RETURN;
+OVS_NO_RETURN static void usage(void);
static void parse_options(int argc, char *argv[]);
static struct jsonrpc *open_jsonrpc(const char *server);
static void fetch_dbs(struct jsonrpc *, struct svec *dbs);
main(int argc, char *argv[])
{
const struct ovsdb_client_command *command;
- const char *database;
+ char *database;
struct jsonrpc *rpc;
- proctitle_init(argc, argv);
+ ovs_cmdl_proctitle_init(argc, argv);
set_program_name(argv[0]);
parse_options(argc, argv);
- signal(SIGPIPE, SIG_IGN);
+ fatal_ignore_sigpipe();
+ daemon_become_new_user(false);
if (optind >= argc) {
ovs_fatal(0, "missing command name; use --help for help");
}
fetch_dbs(rpc, &dbs);
if (argc - optind > command->min_args
&& svec_contains(&dbs, argv[optind])) {
- database = argv[optind++];
+ database = xstrdup(argv[optind++]);
} else if (dbs.n == 1) {
database = xstrdup(dbs.names[0]);
} else if (svec_contains(&dbs, "Open_vSwitch")) {
- database = "Open_vSwitch";
+ database = xstrdup("Open_vSwitch");
} else {
+ jsonrpc_close(rpc);
ovs_fatal(0, "no default database for `%s' command, please "
"specify a database name", command->name);
}
if (argc - optind < command->min_args ||
argc - optind > command->max_args) {
+ free(database);
VLOG_FATAL("invalid syntax for '%s' (use --help for help)",
command->name);
}
command->handler(rpc, database, argc - optind, argv + optind);
+ free(database);
jsonrpc_close(rpc);
if (ferror(stdout)) {
enum {
OPT_BOOTSTRAP_CA_CERT = UCHAR_MAX + 1,
OPT_TIMESTAMP,
+ VLOG_OPTION_ENUMS,
DAEMON_OPTION_ENUMS,
TABLE_OPTION_ENUMS
};
static const struct option long_options[] = {
- {"verbose", optional_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'V'},
{"timestamp", no_argument, NULL, OPT_TIMESTAMP},
+ VLOG_LONG_OPTIONS,
DAEMON_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
{"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
TABLE_LONG_OPTIONS,
{NULL, 0, NULL, 0},
};
- char *short_options = long_options_to_short_options(long_options);
+ char *short_options = ovs_cmdl_long_options_to_short_options(long_options);
for (;;) {
int c;
ovs_print_version(0, 0);
exit(EXIT_SUCCESS);
- case 'v':
- vlog_set_verbosity(optarg);
- break;
-
+ VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
-
TABLE_OPTION_HANDLERS(&table_style)
-
STREAM_SSL_OPTION_HANDLERS
case OPT_BOOTSTRAP_CA_CERT:
"\n monitor [SERVER] [DATABASE] ALL\n"
" monitor all changes to all columns in all tables\n"
" in DATBASE on SERVER.\n"
+ "\n monitor2 [SERVER] [DATABASE] ALL\n"
+ " same usage as monitor, but uses \"monitor2\" method over"
+ " the wire."
"\n dump [SERVER] [DATABASE]\n"
" dump contents of DATABASE on SERVER to stdout\n"
"\nThe default SERVER is unix:%s/db.sock.\n"
}
ovsdb_schema_destroy(schema);
table_print(&t, &table_style);
+ table_destroy(&t);
}
static void
}
ovsdb_schema_destroy(schema);
table_print(&t, &table_style);
+ table_destroy(&t);
}
static void
}
}
+static void
+monitor2_print_row(struct json *row, const char *type, const char *uuid,
+ const struct ovsdb_column_set *columns, struct table *t)
+{
+ if (!strcmp(type, "delete")) {
+ if (row->type != JSON_NULL) {
+ ovs_error(0, "delete method does not expect <row>");
+ return;
+ }
+
+ table_add_row(t);
+ table_add_cell(t)->text = xstrdup(uuid);
+ table_add_cell(t)->text = xstrdup(type);
+ } else {
+ if (!row || row->type != JSON_OBJECT) {
+ ovs_error(0, "<row> is not object");
+ return;
+ }
+ monitor_print_row(row, type, uuid, columns, t);
+ }
+}
+
+static void
+monitor2_print_table(struct json *table_update2,
+ const struct monitored_table *mt, char *caption)
+{
+ const struct ovsdb_table_schema *table = mt->table;
+ const struct ovsdb_column_set *columns = &mt->columns;
+ struct shash_node *node;
+ struct table t;
+ size_t i;
+
+ if (table_update2->type != JSON_OBJECT) {
+ ovs_error(0, "<table-update> for table %s is not object", table->name);
+ return;
+ }
+
+ table_init(&t);
+ table_set_timestamp(&t, timestamp);
+ table_set_caption(&t, caption);
+
+ table_add_column(&t, "row");
+ table_add_column(&t, "action");
+ for (i = 0; i < columns->n_columns; i++) {
+ table_add_column(&t, "%s", columns->columns[i]->name);
+ }
+ SHASH_FOR_EACH (node, json_object(table_update2)) {
+ struct json *row_update2 = node->data;
+ const char *operation;
+ struct json *row;
+ const char *ops[] = {"delete", "initial", "modify", "insert"};
+
+ if (row_update2->type != JSON_OBJECT) {
+ ovs_error(0, "<row-update2> is not object");
+ continue;
+ }
+
+ /* row_update2 contains one of objects indexed by ops[] */
+ for (int i = 0; i < ARRAY_SIZE(ops); i++) {
+ operation = ops[i];
+ row = shash_find_data(json_object(row_update2), operation);
+
+ if (row) {
+ monitor2_print_row(row, operation, node->name, columns, &t);
+ break;
+ }
+ }
+ }
+ table_print(&t, &table_style);
+ table_destroy(&t);
+}
+
+static void
+monitor2_print(struct json *table_updates2,
+ const struct monitored_table *mts, size_t n_mts)
+{
+ size_t i;
+
+ if (table_updates2->type != JSON_OBJECT) {
+ ovs_error(0, "<table-updates2> is not object");
+ return;
+ }
+
+ for (i = 0; i < n_mts; i++) {
+ const struct monitored_table *mt = &mts[i];
+ struct json *table_update = shash_find_data(
+ json_object(table_updates2),
+ mt->table->name);
+ if (table_update) {
+ monitor2_print_table(table_update, mt,
+ n_mts > 1 ? xstrdup(mt->table->name) : NULL);
+ }
+ }
+}
+
static void
add_column(const char *server, const struct ovsdb_column *column,
struct ovsdb_column_set *columns, struct json *columns_json)
}
static void
-do_monitor(struct jsonrpc *rpc, const char *database,
- int argc, char *argv[])
+destroy_monitored_table(struct monitored_table *mts, size_t n)
+{
+ int i;
+
+ for (i = 0; i < n; i++) {
+ struct monitored_table *mt = &mts[i];
+ ovsdb_column_set_destroy(&mt->columns);
+ }
+
+ free(mts);
+}
+
+static void
+do_monitor__(struct jsonrpc *rpc, const char *database,
+ enum ovsdb_monitor_version version,
+ int argc, char *argv[])
{
const char *server = jsonrpc_get_name(rpc);
const char *table_name = argv[0];
struct monitored_table *mts;
size_t n_mts, allocated_mts;
+ ovs_assert(version < OVSDB_MONITOR_VERSION_MAX);
+
daemon_save_fd(STDOUT_FILENO);
- daemonize_start();
+ daemonize_start(false);
if (get_detach()) {
int error;
monitor = json_array_create_3(json_string_create(database),
json_null_create(), monitor_requests);
- request = jsonrpc_create_request("monitor", monitor, NULL);
+ const char *method = version == OVSDB_MONITOR_V2 ? "monitor2"
+ : "monitor";
+
+ request = jsonrpc_create_request(method, monitor, NULL);
request_id = json_clone(request->id);
jsonrpc_send(rpc, request);
msg->id));
} else if (msg->type == JSONRPC_REPLY
&& json_equal(msg->id, request_id)) {
- monitor_print(msg->result, mts, n_mts, true);
+ switch(version) {
+ case OVSDB_MONITOR_V1:
+ monitor_print(msg->result, mts, n_mts, true);
+ break;
+ case OVSDB_MONITOR_V2:
+ monitor2_print(msg->result, mts, n_mts);
+ break;
+ case OVSDB_MONITOR_VERSION_MAX:
+ default:
+ OVS_NOT_REACHED();
+ }
fflush(stdout);
daemonize_complete();
} else if (msg->type == JSONRPC_NOTIFY
monitor_print(params->u.array.elems[1], mts, n_mts, false);
fflush(stdout);
}
+ } else if (msg->type == JSONRPC_NOTIFY
+ && version == OVSDB_MONITOR_V2
+ && !strcmp(msg->method, "update2")) {
+ struct json *params = msg->params;
+ if (params->type == JSON_ARRAY
+ && params->u.array.n == 2
+ && params->u.array.elems[0]->type == JSON_NULL) {
+ monitor2_print(params->u.array.elems[1], mts, n_mts);
+ fflush(stdout);
+ }
}
jsonrpc_msg_destroy(msg);
}
unixctl_server_wait(unixctl);
poll_block();
}
+
+ json_destroy(request_id);
+ unixctl_server_destroy(unixctl);
+ ovsdb_schema_destroy(schema);
+ destroy_monitored_table(mts, n_mts);
+}
+
+static void
+do_monitor(struct jsonrpc *rpc, const char *database,
+ int argc, char *argv[])
+{
+ do_monitor__(rpc, database, OVSDB_MONITOR_V1, argc, argv);
+}
+
+static void
+do_monitor2(struct jsonrpc *rpc, const char *database,
+ int argc, char *argv[])
+{
+ do_monitor__(rpc, database, OVSDB_MONITOR_V2, argc, argv);
}
struct dump_table_aux {
}
static void
-dump_table(const struct ovsdb_table_schema *ts, struct json_array *rows)
+dump_table(const char *table_name, const struct shash *cols,
+ struct json_array *rows)
{
const struct ovsdb_column **columns;
size_t n_columns;
size_t x, y;
/* Sort columns by name, for reproducibility. */
- columns = xmalloc(shash_count(&ts->columns) * sizeof *columns);
+ columns = xmalloc(shash_count(cols) * sizeof *columns);
n_columns = 0;
- SHASH_FOR_EACH (node, &ts->columns) {
+ SHASH_FOR_EACH (node, cols) {
struct ovsdb_column *column = node->data;
if (strcmp(column->name, "_version")) {
columns[n_columns++] = column;
if (rows->elems[y]->type != JSON_OBJECT) {
ovs_fatal(0, "row %"PRIuSIZE" in table %s response is not a JSON object: "
- "%s", y, ts->name, json_to_string(rows->elems[y], 0));
+ "%s", y, table_name, json_to_string(rows->elems[y], 0));
}
row = json_object(rows->elems[y]);
const struct json *json = shash_find_data(row, columns[x]->name);
if (!json) {
ovs_fatal(0, "row %"PRIuSIZE" in table %s response lacks %s column",
- y, ts->name, columns[x]->name);
+ y, table_name, columns[x]->name);
}
check_ovsdb_error(ovsdb_datum_from_json(&data[y][x],
/* Add column headings. */
table_init(&t);
- table_set_caption(&t, xasprintf("%s table", ts->name));
+ table_set_caption(&t, xasprintf("%s table", table_name));
for (x = 0; x < n_columns; x++) {
table_add_column(&t, "%s", columns[x]->name);
}
static void
do_dump(struct jsonrpc *rpc, const char *database,
- int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+ int argc, char *argv[])
{
struct jsonrpc_msg *request, *reply;
struct ovsdb_schema *schema;
struct json *transaction;
- const struct shash_node **tables;
+ const struct shash_node *node, **tables;
size_t n_tables;
+ struct ovsdb_table_schema *tschema;
+ const struct shash *columns;
+ struct shash custom_columns;
size_t i;
+ shash_init(&custom_columns);
schema = fetch_schema(rpc, database);
- tables = shash_sort(&schema->tables);
- n_tables = shash_count(&schema->tables);
+ if (argc) {
+ node = shash_find(&schema->tables, argv[0]);
+ if (!node) {
+ ovs_fatal(0, "No table \"%s\" found.", argv[0]);
+ }
+ tables = xmemdup(&node, sizeof(&node));
+ n_tables = 1;
+ tschema = tables[0]->data;
+ for (i = 1; i < argc; i++) {
+ node = shash_find(&tschema->columns, argv[i]);
+ if (!node) {
+ ovs_fatal(0, "Table \"%s\" has no column %s.", argv[0], argv[1]);
+ }
+ shash_add(&custom_columns, argv[1], node->data);
+ }
+ } else {
+ tables = shash_sort(&schema->tables);
+ n_tables = shash_count(&schema->tables);
+ }
/* Construct transaction to retrieve entire database. */
transaction = json_array_create_1(json_string_create(database));
for (i = 0; i < n_tables; i++) {
const struct ovsdb_table_schema *ts = tables[i]->data;
- struct json *op, *columns;
- struct shash_node *node;
+ struct json *op, *jcolumns;
- columns = json_array_create_empty();
- SHASH_FOR_EACH (node, &ts->columns) {
+ if (argc > 1) {
+ columns = &custom_columns;
+ } else {
+ columns = &ts->columns;
+ }
+ jcolumns = json_array_create_empty();
+ SHASH_FOR_EACH (node, columns) {
const struct ovsdb_column *column = node->data;
if (strcmp(column->name, "_version")) {
- json_array_add(columns, json_string_create(column->name));
+ json_array_add(jcolumns, json_string_create(column->name));
}
}
json_object_put_string(op, "op", "select");
json_object_put_string(op, "table", tables[i]->name);
json_object_put(op, "where", json_array_create_empty());
- json_object_put(op, "columns", columns);
+ json_object_put(op, "columns", jcolumns);
json_array_add(transaction, op);
}
ts->name, json_to_string(op_result, 0));
}
- dump_table(ts, &rows->u.array);
+ if (argc > 1) {
+ dump_table(tables[i]->name, &custom_columns, &rows->u.array);
+ } else {
+ dump_table(tables[i]->name, &ts->columns, &rows->u.array);
+ }
}
jsonrpc_msg_destroy(reply);
+ shash_destroy(&custom_columns);
free(tables);
ovsdb_schema_destroy(schema);
}
{ "list-columns", NEED_DATABASE, 0, 1, do_list_columns },
{ "transact", NEED_RPC, 1, 1, do_transact },
{ "monitor", NEED_DATABASE, 1, INT_MAX, do_monitor },
- { "dump", NEED_DATABASE, 0, 0, do_dump },
-
+ { "monitor2", NEED_DATABASE, 1, INT_MAX, do_monitor2 },
+ { "dump", NEED_DATABASE, 0, INT_MAX, do_dump },
{ "help", NEED_NONE, 0, INT_MAX, do_help },
{ NULL, 0, 0, 0, NULL },
projects / cascardo / ovs.git / blobdiff