X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=664b9daacbfd43f1385fa8a6e6f9c515c82c9eb0;hb=58f870d005d48f299785e7dbd0f153dd544f2a5a;hp=66ba41818cb0285ca40e93ea290f376e3ba281cf;hpb=0a140468ddcff3f767a3069fe3303c7ae000a855;p=openvswitch diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index 66ba4181..664b9daa 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "command-line.h" #include "compiler.h" @@ -36,9 +37,12 @@ #include "ovsdb-idl.h" #include "poll-loop.h" #include "process.h" +#include "stream.h" #include "stream-ssl.h" +#include "sset.h" #include "svec.h" #include "vswitchd/vswitch-idl.h" +#include "table.h" #include "timeval.h" #include "util.h" #include "vlog.h" @@ -61,7 +65,7 @@ struct vsctl_command_syntax { void (*prerequisites)(struct vsctl_context *ctx); /* Does the actual work of the command and puts the command's output, if - * any, in ctx->output. + * any, in ctx->output or ctx->table. * * Alternatively, if some prerequisite of the command is not met and the * caller should wait for something to change and then retry, it may set @@ -90,6 +94,7 @@ struct vsctl_command { /* Data modified by commands. */ struct ds output; + struct table *table; }; /* --db: The database server to contact. */ @@ -107,6 +112,9 @@ static bool wait_for_reload = true; /* --timeout: Time to wait for a connection to 'db'. */ static int timeout; +/* Format for table output. */ +static struct table_style table_style = TABLE_STYLE_DEFAULT; + /* All supported commands. */ static const struct vsctl_command_syntax all_commands[]; @@ -195,23 +203,23 @@ parse_options(int argc, char *argv[]) OPT_NO_WAIT, OPT_DRY_RUN, OPT_PEER_CA_CERT, - VLOG_OPTION_ENUMS + VLOG_OPTION_ENUMS, + TABLE_OPTION_ENUMS }; static struct option long_options[] = { - {"db", required_argument, 0, OPT_DB}, - {"no-syslog", no_argument, 0, OPT_NO_SYSLOG}, - {"no-wait", no_argument, 0, OPT_NO_WAIT}, - {"dry-run", no_argument, 0, OPT_DRY_RUN}, - {"oneline", no_argument, 0, OPT_ONELINE}, - {"timeout", required_argument, 0, 't'}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, + {"db", required_argument, NULL, OPT_DB}, + {"no-syslog", no_argument, NULL, OPT_NO_SYSLOG}, + {"no-wait", no_argument, NULL, OPT_NO_WAIT}, + {"dry-run", no_argument, NULL, OPT_DRY_RUN}, + {"oneline", no_argument, NULL, OPT_ONELINE}, + {"timeout", required_argument, NULL, 't'}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, VLOG_LONG_OPTIONS, -#ifdef HAVE_OPENSSL - STREAM_SSL_LONG_OPTIONS - {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT}, -#endif - {0, 0, 0, 0}, + TABLE_LONG_OPTIONS, + STREAM_SSL_LONG_OPTIONS, + {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT}, + {NULL, 0, NULL, 0}, }; char *tmp, *short_options; @@ -219,6 +227,8 @@ parse_options(int argc, char *argv[]) short_options = xasprintf("+%s", tmp); free(tmp); + table_style.format = TF_LIST; + for (;;) { int c; @@ -264,14 +274,13 @@ parse_options(int argc, char *argv[]) break; VLOG_OPTION_HANDLERS + TABLE_OPTION_HANDLERS(&table_style) -#ifdef HAVE_OPENSSL STREAM_SSL_OPTION_HANDLERS case OPT_PEER_CA_CERT: stream_ssl_set_peer_ca_cert_file(optarg); break; -#endif case '?': exit(EXIT_FAILURE); @@ -465,6 +474,10 @@ usage(void) %s: ovs-vswitchd management utility\n\ usage: %s [OPTIONS] COMMAND [ARG...]\n\ \n\ +Open vSwitch commands:\n\ + init initialize database, if not yet initialized\n\ + emer-reset reset configuration to clean state\n\ +\n\ Bridge commands:\n\ add-br BRIDGE create a new bridge named BRIDGE\n\ add-br BRIDGE PARENT VLAN create new fake BRIDGE in PARENT on VLAN\n\ @@ -478,13 +491,12 @@ Bridge commands:\n\ br-get-external-id BRIDGE KEY print value of KEY on BRIDGE\n\ br-get-external-id BRIDGE list key-value pairs on BRIDGE\n\ \n\ -Port commands:\n\ +Port commands (a bond is considered to be a single port):\n\ list-ports BRIDGE print the names of all the ports on BRIDGE\n\ add-port BRIDGE PORT add network device PORT to BRIDGE\n\ add-bond BRIDGE PORT IFACE... add bonded port PORT in BRIDGE from IFACES\n\ del-port [BRIDGE] PORT delete PORT (which may be bonded) from BRIDGE\n\ port-to-br PORT print name of bridge that contains PORT\n\ -A bond is considered to be a single port.\n\ \n\ Interface commands (a bond consists of multiple interfaces):\n\ list-ifaces BRIDGE print the names of all interfaces on BRIDGE\n\ @@ -527,9 +539,15 @@ Potentially unsafe database commands require --force option.\n\ Options:\n\ --db=DATABASE connect to DATABASE\n\ (default: %s)\n\ + --no-wait do not wait for ovs-vswitchd to reconfigure\n\ + -t, --timeout=SECS wait at most SECS seconds for ovs-vswitchd\n\ + --dry-run do not commit changes to database\n\ --oneline print exactly one line of output per command\n", program_name, program_name, default_db()); vlog_usage(); + printf("\ + --no-syslog equivalent to --verbose=vsctl:syslog:warn\n"); + stream_usage("database", true, true, false); printf("\n\ Other options:\n\ -h, --help display this help message\n\ @@ -570,6 +588,7 @@ struct vsctl_context { /* Modifiable state. */ struct ds output; + struct table *table; struct ovsdb_idl *idl; struct ovsdb_idl_txn *txn; struct ovsdb_symbol_table *symtab; @@ -736,7 +755,7 @@ static void get_info(struct vsctl_context *ctx, struct vsctl_info *info) { const struct ovsrec_open_vswitch *ovs = ctx->ovs; - struct shash bridges, ports; + struct sset bridges, ports; size_t i; info->ctx = ctx; @@ -744,14 +763,14 @@ get_info(struct vsctl_context *ctx, struct vsctl_info *info) shash_init(&info->ports); shash_init(&info->ifaces); - shash_init(&bridges); - shash_init(&ports); + sset_init(&bridges); + sset_init(&ports); for (i = 0; i < ovs->n_bridges; i++) { struct ovsrec_bridge *br_cfg = ovs->bridges[i]; struct vsctl_bridge *br; size_t j; - if (!shash_add_once(&bridges, br_cfg->name, NULL)) { + if (!sset_add(&bridges, br_cfg->name)) { VLOG_WARN("%s: database contains duplicate bridge name", br_cfg->name); continue; @@ -764,29 +783,29 @@ get_info(struct vsctl_context *ctx, struct vsctl_info *info) for (j = 0; j < br_cfg->n_ports; j++) { struct ovsrec_port *port_cfg = br_cfg->ports[j]; - if (!shash_add_once(&ports, port_cfg->name, NULL)) { + if (!sset_add(&ports, port_cfg->name)) { VLOG_WARN("%s: database contains duplicate port name", port_cfg->name); continue; } if (port_is_fake_bridge(port_cfg) - && shash_add_once(&bridges, port_cfg->name, NULL)) { + && sset_add(&bridges, port_cfg->name)) { add_bridge(info, NULL, port_cfg->name, br, *port_cfg->tag); } } } - shash_destroy(&bridges); - shash_destroy(&ports); + sset_destroy(&bridges); + sset_destroy(&ports); - shash_init(&bridges); - shash_init(&ports); + sset_init(&bridges); + sset_init(&ports); for (i = 0; i < ovs->n_bridges; i++) { struct ovsrec_bridge *br_cfg = ovs->bridges[i]; struct vsctl_bridge *br; size_t j; - if (!shash_add_once(&bridges, br_cfg->name, NULL)) { + if (!sset_add(&bridges, br_cfg->name)) { continue; } br = shash_find_data(&info->bridges, br_cfg->name); @@ -795,12 +814,12 @@ get_info(struct vsctl_context *ctx, struct vsctl_info *info) struct vsctl_port *port; size_t k; - if (!shash_add_once(&ports, port_cfg->name, NULL)) { + if (!sset_add(&ports, port_cfg->name)) { continue; } if (port_is_fake_bridge(port_cfg) - && !shash_add_once(&bridges, port_cfg->name, NULL)) { + && !sset_add(&bridges, port_cfg->name)) { continue; } @@ -834,8 +853,8 @@ get_info(struct vsctl_context *ctx, struct vsctl_info *info) } } } - shash_destroy(&bridges); - shash_destroy(&ports); + sset_destroy(&bridges); + sset_destroy(&ports); } static void @@ -988,7 +1007,6 @@ cmd_init(struct vsctl_context *ctx OVS_UNUSED) static void pre_cmd_emer_reset(struct vsctl_context *ctx) { - ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_managers); ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_manager_options); ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_ssl); @@ -1023,7 +1041,6 @@ cmd_emer_reset(struct vsctl_context *ctx) const struct ovsrec_sflow *sflow, *next_sflow; /* Reset the Open_vSwitch table. */ - ovsrec_open_vswitch_set_managers(ctx->ovs, NULL, 0); ovsrec_open_vswitch_set_manager_options(ctx->ovs, NULL, 0); ovsrec_open_vswitch_set_ssl(ctx->ovs, NULL); @@ -1094,7 +1111,7 @@ cmd_emer_reset(struct vsctl_context *ctx) static void cmd_add_br(struct vsctl_context *ctx) { - bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; + bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL; const char *br_name, *parent_name; struct vsctl_info info; int vlan; @@ -1384,7 +1401,7 @@ get_external_id(char **keys, char **values, size_t n, if (!key && !strncmp(keys[i], prefix, prefix_len)) { svec_add_nocopy(&svec, xasprintf("%s=%s", keys[i] + prefix_len, values[i])); - } else if (key_matches(keys[i], prefix, prefix_len, key)) { + } else if (key && key_matches(keys[i], prefix, prefix_len, key)) { svec_add(&svec, values[i]); break; } @@ -1546,7 +1563,7 @@ add_port(struct vsctl_context *ctx, static void cmd_add_port(struct vsctl_context *ctx) { - bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; + bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL; add_port(ctx, ctx->argv[1], ctx->argv[2], may_exist, false, &ctx->argv[2], 1, &ctx->argv[3], ctx->argc - 3); @@ -1555,7 +1572,7 @@ cmd_add_port(struct vsctl_context *ctx) static void cmd_add_bond(struct vsctl_context *ctx) { - bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; + bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL; bool fake_iface = shash_find(&ctx->options, "--fake-iface"); int n_ifaces; int i; @@ -1772,6 +1789,7 @@ cmd_del_controller(struct vsctl_context *ctx) struct vsctl_bridge *br; get_info(ctx, &info); + br = find_real_bridge(&info, ctx->argv[1], true); verify_controllers(br->br_cfg); @@ -1877,7 +1895,6 @@ verify_managers(const struct ovsrec_open_vswitch *ovs) { size_t i; - ovsrec_open_vswitch_verify_managers(ovs); ovsrec_open_vswitch_verify_manager_options(ovs); for (i = 0; i < ovs->n_manager_options; ++i) { @@ -1890,7 +1907,6 @@ verify_managers(const struct ovsrec_open_vswitch *ovs) static void pre_manager(struct vsctl_context *ctx) { - ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_managers); ovsdb_idl_add_column(ctx->idl, &ovsrec_open_vswitch_col_manager_options); ovsdb_idl_add_column(ctx->idl, &ovsrec_manager_col_target); } @@ -1907,12 +1923,6 @@ cmd_get_manager(struct vsctl_context *ctx) /* Print the targets in sorted order for reproducibility. */ svec_init(&targets); - /* First, add all targets found in deprecated 'managers' column. */ - for (i = 0; i < ovs->n_managers; i++) { - svec_add(&targets, ovs->managers[i]); - } - - /* Second, add all targets pointed to by 'manager_options' column. */ for (i = 0; i < ovs->n_manager_options; i++) { svec_add(&targets, ovs->manager_options[i]->target); } @@ -1930,9 +1940,6 @@ delete_managers(const struct vsctl_context *ctx) const struct ovsrec_open_vswitch *ovs = ctx->ovs; size_t i; - /* Delete manager targets in deprecated 'managers' column. */ - ovsrec_open_vswitch_set_managers(ovs, NULL, 0); - /* Delete Manager rows pointed to by 'manager_options' column. */ for (i = 0; i < ovs->n_manager_options; i++) { ovsrec_manager_delete(ovs->manager_options[i]); @@ -1957,9 +1964,6 @@ insert_managers(struct vsctl_context *ctx, char *targets[], size_t n) struct ovsrec_manager **managers; size_t i; - /* Store in deprecated 'manager' column. */ - ovsrec_open_vswitch_set_managers(ctx->ovs, targets, n); - /* Insert each manager in a new row in Manager table. */ managers = xmalloc(n * sizeof *managers); for (i = 0; i < n; i++) { @@ -2111,16 +2115,6 @@ static const struct vsctl_table_class tables[] = { {{&ovsrec_table_port, &ovsrec_port_col_name, &ovsrec_port_col_qos}, {NULL, NULL, NULL}}}, - {&ovsrec_table_monitor, - {{&ovsrec_table_interface, - &ovsrec_interface_col_name, - &ovsrec_interface_col_monitor}, - {NULL, NULL, NULL}}}, - - {&ovsrec_table_maintenance_point, - {{NULL, NULL, NULL}, - {NULL, NULL, NULL}}}, - {&ovsrec_table_queue, {{NULL, NULL, NULL}, {NULL, NULL, NULL}}}, @@ -2346,7 +2340,7 @@ get_column(const struct vsctl_table_class *table, const char *column_name, } } -static struct uuid * +static struct ovsdb_symbol * create_symbol(struct ovsdb_symbol_table *symtab, const char *id, bool *newp) { struct ovsdb_symbol *symbol; @@ -2360,12 +2354,12 @@ create_symbol(struct ovsdb_symbol_table *symtab, const char *id, bool *newp) } symbol = ovsdb_symbol_table_insert(symtab, id); - if (symbol->used) { + if (symbol->created) { vsctl_fatal("row id \"%s\" may only be specified on one --id option", id); } - symbol->used = true; - return &symbol->uuid; + symbol->created = true; + return symbol; } static void @@ -2403,13 +2397,12 @@ missing_operator_error(const char *arg, const char **allowed_operators, /* Breaks 'arg' apart into a number of fields in the following order: * - * - If 'columnp' is nonnull, the name of a column in 'table'. The column - * is stored into '*columnp'. The column name may be abbreviated. + * - The name of a column in 'table', stored into '*columnp'. The column + * name may be abbreviated. * - * - If 'keyp' is nonnull, optionally a key string. (If both 'columnp' - * and 'keyp' are nonnull, then the column and key names are expected to - * be separated by ':'). The key is stored as a malloc()'d string into - * '*keyp', or NULL if no key is present in 'arg'. + * - Optionally ':' followed by a key string. The key is stored as a + * malloc()'d string into '*keyp', or NULL if no key is present in + * 'arg'. * * - If 'valuep' is nonnull, an operator followed by a value string. The * allowed operators are the 'n_allowed' string in 'allowed_operators', @@ -2419,8 +2412,6 @@ missing_operator_error(const char *arg, const char **allowed_operators, * stored as a malloc()'d string into '*valuep', or NULL if no value is * present in 'arg'. * - * At least 'columnp' or 'keyp' must be nonnull. - * * On success, returns NULL. On failure, returned a malloc()'d string error * message and stores NULL into all of the nonnull output arguments. */ static char * WARN_UNUSED_RESULT @@ -2432,51 +2423,38 @@ parse_column_key_value(const char *arg, char **valuep) { const char *p = arg; + char *column_name; char *error; - assert(columnp || keyp); assert(!(operatorp && !valuep)); - if (keyp) { - *keyp = NULL; - } + *keyp = NULL; if (valuep) { *valuep = NULL; } /* Parse column name. */ - if (columnp) { - char *column_name; - - error = ovsdb_token_parse(&p, &column_name); - if (error) { - goto error; - } - if (column_name[0] == '\0') { - free(column_name); - error = xasprintf("%s: missing column name", arg); - goto error; - } - error = get_column(table, column_name, columnp); + error = ovsdb_token_parse(&p, &column_name); + if (error) { + goto error; + } + if (column_name[0] == '\0') { free(column_name); - if (error) { - goto error; - } + error = xasprintf("%s: missing column name", arg); + goto error; + } + error = get_column(table, column_name, columnp); + free(column_name); + if (error) { + goto error; } /* Parse key string. */ - if (*p == ':' || !columnp) { - if (columnp) { - p++; - } else if (!keyp) { - error = xasprintf("%s: key not accepted here", arg); - goto error; - } + if (*p == ':') { + p++; error = ovsdb_token_parse(&p, keyp); if (error) { goto error; } - } else if (keyp) { - *keyp = NULL; } /* Parse value string. */ @@ -2512,9 +2490,6 @@ parse_column_key_value(const char *arg, } *valuep = xstrdup(p + best_len); } else { - if (valuep) { - *valuep = NULL; - } if (*p != '\0') { error = xasprintf("%s: trailing garbage \"%s\" in argument", arg, p); @@ -2524,13 +2499,9 @@ parse_column_key_value(const char *arg, return NULL; error: - if (columnp) { - *columnp = NULL; - } - if (keyp) { - free(*keyp); - *keyp = NULL; - } + *columnp = NULL; + free(*keyp); + *keyp = NULL; if (valuep) { free(*valuep); *valuep = NULL; @@ -2563,10 +2534,20 @@ pre_parse_column_key_value(struct vsctl_context *ctx, static void pre_cmd_get(struct vsctl_context *ctx) { + const char *id = shash_find_data(&ctx->options, "--id"); const char *table_name = ctx->argv[1]; const struct vsctl_table_class *table; int i; + /* Using "get" without --id or a column name could possibly make sense. + * Maybe, for example, a ovs-vsctl run wants to assert that a row exists. + * But it is unlikely that an interactive user would want to do that, so + * issue a warning if we're running on a terminal. */ + if (!id && ctx->argc <= 3 && isatty(STDOUT_FILENO)) { + VLOG_WARN("\"get\" command without row arguments or \"--id\" is " + "possibly erroneous"); + } + table = pre_get_table(ctx, table_name); for (i = 3; i < ctx->argc; i++) { if (!strcasecmp(ctx->argv[i], "_uuid") @@ -2593,13 +2574,19 @@ cmd_get(struct vsctl_context *ctx) table = get_table(table_name); row = must_get_row(ctx, table, record_id); if (id) { + struct ovsdb_symbol *symbol; bool new; - *create_symbol(ctx->symtab, id, &new) = row->uuid; + symbol = create_symbol(ctx->symtab, id, &new); if (!new) { vsctl_fatal("row id \"%s\" specified on \"get\" command was used " "before it was defined", id); } + symbol->uuid = row->uuid; + + /* This symbol refers to a row that already exists, so disable warnings + * about it being unreferenced. */ + symbol->strong_ref = true; } for (i = 3; i < ctx->argc; i++) { const struct ovsdb_idl_column *column; @@ -2737,24 +2724,54 @@ pre_cmd_list(struct vsctl_context *ctx) pre_list_columns(ctx, table, column_names); } +static struct table * +list_make_table(const struct ovsdb_idl_column **columns, size_t n_columns) +{ + struct table *out; + size_t i; + + out = xmalloc(sizeof *out); + table_init(out); + + for (i = 0; i < n_columns; i++) { + const struct ovsdb_idl_column *column = columns[i]; + const char *column_name = column ? column->name : "_uuid"; + + table_add_column(out, "%s", column_name); + } + + return out; +} + static void list_record(const struct ovsdb_idl_row *row, const struct ovsdb_idl_column **columns, size_t n_columns, - struct ds *out) + struct table *out) { size_t i; + table_add_row(out); for (i = 0; i < n_columns; i++) { const struct ovsdb_idl_column *column = columns[i]; + struct cell *cell = table_add_cell(out); if (!column) { - ds_put_format(out, "%-20s: "UUID_FMT"\n", "_uuid", - UUID_ARGS(&row->uuid)); + struct ovsdb_datum datum; + union ovsdb_atom atom; + + atom.uuid = row->uuid; + + datum.keys = &atom; + datum.values = NULL; + datum.n = 1; + + cell->json = ovsdb_datum_to_json(&datum, &ovsdb_type_uuid); + cell->type = &ovsdb_type_uuid; } else { const struct ovsdb_datum *datum = ovsdb_idl_read(row, column); - ds_put_format(out, "%-20s: ", column->name); - ovsdb_datum_to_string(datum, &column->type, out); - ds_put_char(out, '\n'); + + cell->json = ovsdb_datum_to_json(datum, &column->type); + cell->type = &column->type; } } } @@ -2766,30 +2783,23 @@ cmd_list(struct vsctl_context *ctx) const struct ovsdb_idl_column **columns; const char *table_name = ctx->argv[1]; const struct vsctl_table_class *table; - struct ds *out = &ctx->output; + struct table *out; size_t n_columns; int i; table = get_table(table_name); parse_column_names(column_names, table, &columns, &n_columns); + out = ctx->table = list_make_table(columns, n_columns); if (ctx->argc > 2) { for (i = 2; i < ctx->argc; i++) { - if (i > 2) { - ds_put_char(out, '\n'); - } list_record(must_get_row(ctx, table, ctx->argv[i]), columns, n_columns, out); } } else { const struct ovsdb_idl_row *row; - bool first; - for (row = ovsdb_idl_first_row(ctx->idl, table->class), first = true; - row != NULL; - row = ovsdb_idl_next_row(row), first = false) { - if (!first) { - ds_put_char(out, '\n'); - } + for (row = ovsdb_idl_first_row(ctx->idl, table->class); row != NULL; + row = ovsdb_idl_next_row(row)) { list_record(row, columns, n_columns, out); } } @@ -2819,12 +2829,12 @@ cmd_find(struct vsctl_context *ctx) const char *table_name = ctx->argv[1]; const struct vsctl_table_class *table; const struct ovsdb_idl_row *row; - struct ds *out = &ctx->output; + struct table *out; size_t n_columns; table = get_table(table_name); parse_column_names(column_names, table, &columns, &n_columns); - + out = ctx->table = list_make_table(columns, n_columns); for (row = ovsdb_idl_first_row(ctx->idl, table->class); row; row = ovsdb_idl_next_row(row)) { int i; @@ -2835,13 +2845,11 @@ cmd_find(struct vsctl_context *ctx) goto next_row; } } - if (out->length) { - ds_put_char(out, '\n'); - } list_record(row, columns, n_columns, out); next_row: ; } + free(columns); } static void @@ -3085,18 +3093,42 @@ cmd_clear(struct vsctl_context *ctx) } static void -cmd_create(struct vsctl_context *ctx) +pre_create(struct vsctl_context *ctx) { const char *id = shash_find_data(&ctx->options, "--id"); const char *table_name = ctx->argv[1]; const struct vsctl_table_class *table; + + table = get_table(table_name); + if (!id && !table->class->is_root) { + VLOG_WARN("applying \"create\" command to table %s without --id " + "option will have no effect", table->class->name); + } +} + +static void +cmd_create(struct vsctl_context *ctx) +{ + const char *id = shash_find_data(&ctx->options, "--id"); + const char *table_name = ctx->argv[1]; + const struct vsctl_table_class *table = get_table(table_name); const struct ovsdb_idl_row *row; const struct uuid *uuid; int i; - uuid = id ? create_symbol(ctx->symtab, id, NULL) : NULL; + if (id) { + struct ovsdb_symbol *symbol = create_symbol(ctx->symtab, id, NULL); + if (table->class->is_root) { + /* This table is in the root set, meaning that rows created in it + * won't disappear even if they are unreferenced, so disable + * warnings about that by pretending that there is a reference. */ + symbol->strong_ref = true; + } + uuid = &symbol->uuid; + } else { + uuid = NULL; + } - table = get_table(table_name); row = ovsdb_idl_txn_insert(ctx->txn, table->class, uuid); for (i = 2; i < ctx->argc; i++) { set_column(table, row, ctx->argv[i], ctx->symtab); @@ -3119,7 +3151,9 @@ post_create(struct vsctl_context *ctx) const struct uuid *real; struct uuid dummy; - uuid_from_string(&dummy, ds_cstr(&ctx->output)); + if (!uuid_from_string(&dummy, ds_cstr(&ctx->output))) { + NOT_REACHED(); + } real = ovsdb_idl_txn_get_insert_uuid(ctx->txn, &dummy); if (real) { ds_clear(&ctx->output); @@ -3292,6 +3326,7 @@ vsctl_context_init(struct vsctl_context *ctx, struct vsctl_command *command, ctx->options = command->options; ds_swap(&ctx->output, &command->output); + ctx->table = command->table; ctx->idl = idl; ctx->txn = txn; ctx->ovs = ovs; @@ -3305,6 +3340,7 @@ static void vsctl_context_done(struct vsctl_context *ctx, struct vsctl_command *command) { ds_swap(&ctx->output, &command->output); + command->table = ctx->table; } static void @@ -3322,12 +3358,14 @@ run_prerequisites(struct vsctl_command *commands, size_t n_commands, struct vsctl_context ctx; ds_init(&c->output); + c->table = NULL; vsctl_context_init(&ctx, c, idl, NULL, NULL, NULL); (c->syntax->prerequisites)(&ctx); vsctl_context_done(&ctx, c); assert(!c->output.string); + assert(!c->table); } } } @@ -3340,8 +3378,8 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, const struct ovsrec_open_vswitch *ovs; enum ovsdb_idl_txn_status status; struct ovsdb_symbol_table *symtab; - const char *unused; struct vsctl_command *c; + struct shash_node *node; int64_t next_cfg = 0; char *error = NULL; @@ -3367,6 +3405,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, symtab = ovsdb_symbol_table_create(); for (c = commands; c < &commands[n_commands]; c++) { ds_init(&c->output); + c->table = NULL; } for (c = commands; c < &commands[n_commands]; c++) { struct vsctl_context ctx; @@ -3380,6 +3419,26 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, } } + SHASH_FOR_EACH (node, &symtab->sh) { + struct ovsdb_symbol *symbol = node->data; + if (!symbol->created) { + vsctl_fatal("row id \"%s\" is referenced but never created (e.g. " + "with \"-- --id=%s create ...\")", + node->name, node->name); + } + if (!symbol->strong_ref) { + if (!symbol->weak_ref) { + VLOG_WARN("row id \"%s\" was created but no reference to it " + "was inserted, so it will not actually appear in " + "the database", node->name); + } else { + VLOG_WARN("row id \"%s\" was created but only a weak " + "reference to it was inserted, so it will not " + "actually appear in the database", node->name); + } + } + } + status = ovsdb_idl_txn_commit_block(txn); if (wait_for_reload && status == TXN_SUCCESS) { next_cfg = ovsdb_idl_txn_get_increment_new_value(txn); @@ -3399,12 +3458,6 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, ovsdb_idl_txn_destroy(txn); txn = the_idl_txn = NULL; - unused = ovsdb_symbol_table_find_unused(symtab); - if (unused) { - vsctl_fatal("row id \"%s\" is referenced but never created (e.g. " - "with \"-- --id=%s create ...\")", unused, unused); - } - switch (status) { case TXN_INCOMPLETE: NOT_REACHED(); @@ -3433,7 +3486,9 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, for (c = commands; c < &commands[n_commands]; c++) { struct ds *ds = &c->output; - if (oneline) { + if (c->table) { + table_print(c->table, &table_style); + } else if (oneline) { size_t j; ds_chomp(ds, '\n'); @@ -3457,6 +3512,8 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, fputs(ds_cstr(ds), stdout); } ds_destroy(&c->output); + table_destroy(c->table); + free(c->table); smap_destroy(&c->options); } @@ -3489,6 +3546,8 @@ try_again: ovsdb_symbol_table_destroy(symtab); for (c = commands; c < &commands[n_commands]; c++) { ds_destroy(&c->output); + table_destroy(c->table); + free(c->table); } free(error); } @@ -3553,7 +3612,7 @@ static const struct vsctl_command_syntax all_commands[] = { {"add", 4, INT_MAX, pre_cmd_add, cmd_add, NULL, "", RW}, {"remove", 4, INT_MAX, pre_cmd_remove, cmd_remove, NULL, "", RW}, {"clear", 3, INT_MAX, pre_cmd_clear, cmd_clear, NULL, "", RW}, - {"create", 2, INT_MAX, NULL, cmd_create, post_create, "--id=", RW}, + {"create", 2, INT_MAX, pre_create, cmd_create, post_create, "--id=", RW}, {"destroy", 1, INT_MAX, pre_cmd_destroy, cmd_destroy, NULL, "--if-exists", RW}, {"wait-until", 2, INT_MAX, pre_cmd_wait_until, cmd_wait_until, NULL, "",