X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=4d50194aaa33a4fb8eef0d40e05cb968269aee27;hb=d5beca6881b3ce12bdf6a64e463bdde5d1d0aaaf;hp=2f78a53bcfe74be44a6fa654d7be75e8cd2ced8e;hpb=f40a9b61e2b758e60a38fc706d7d1253ef59a23d;p=openvswitch diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index 2f78a53b..4d50194a 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -41,9 +41,9 @@ #include "vswitchd/vswitch-idl.h" #include "timeval.h" #include "util.h" - #include "vlog.h" -#define THIS_MODULE VLM_vsctl + +VLOG_DEFINE_THIS_MODULE(vsctl) /* vsctl_fatal() also logs the error, so it is preferred in this file. */ #define ovs_fatal please_use_vsctl_fatal_instead_of_ovs_fatal @@ -118,18 +118,16 @@ static void set_column(const struct vsctl_table_class *, int main(int argc, char *argv[]) { + extern struct vlog_module VLM_reconnect; struct ovsdb_idl *idl; struct vsctl_command *commands; size_t n_commands; char *args; - int trials; set_program_name(argv[0]); signal(SIGPIPE, SIG_IGN); - time_init(); - vlog_init(); - vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_WARN); - vlog_set_levels(VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN); + vlog_set_levels(NULL, VLF_CONSOLE, VLL_WARN); + vlog_set_levels(&VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN); ovsrec_init(); /* Log our arguments. This is often valuable for debugging systems. */ @@ -146,12 +144,8 @@ main(int argc, char *argv[]) /* Now execute the commands. */ idl = the_idl = ovsdb_idl_create(db, &ovsrec_idl_class); - trials = 0; for (;;) { if (ovsdb_idl_run(idl)) { - if (++trials > 5) { - vsctl_fatal("too many database inconsistency failures"); - } do_vsctl(args, commands, n_commands, idl); } @@ -188,12 +182,16 @@ parse_options(int argc, char *argv[]) #endif {0, 0, 0, 0}, }; + char *tmp, *short_options; + tmp = long_options_to_short_options(long_options); + short_options = xasprintf("+%s", tmp); + free(tmp); for (;;) { int c; - c = getopt_long(argc, argv, "+v::hVt:", long_options, NULL); + c = getopt_long(argc, argv, short_options, long_options, NULL); if (c == -1) { break; } @@ -208,7 +206,7 @@ parse_options(int argc, char *argv[]) break; case OPT_NO_SYSLOG: - vlog_set_levels(VLM_vsctl, VLF_SYSLOG, VLL_WARN); + vlog_set_levels(&VLM_vsctl, VLF_SYSLOG, VLL_WARN); break; case OPT_NO_WAIT: @@ -251,6 +249,7 @@ parse_options(int argc, char *argv[]) abort(); } } + free(short_options); if (!db) { db = default_db(); @@ -390,7 +389,7 @@ vsctl_fatal(const char *format, ...) message = xvasprintf(format, args); va_end(args); - vlog_set_levels(VLM_vsctl, VLF_CONSOLE, VLL_EMER); + vlog_set_levels(&VLM_vsctl, VLF_CONSOLE, VLL_EMER); VLOG_ERR("%s", message); ovs_error(0, "%s", message); vsctl_exit(EXIT_FAILURE); @@ -446,12 +445,12 @@ Interface commands (a bond consists of multiple interfaces):\n\ iface-to-br IFACE print name of bridge that contains IFACE\n\ \n\ Controller commands:\n\ - get-controller [BRIDGE] print the controller for BRIDGE\n\ - del-controller [BRIDGE] delete the controller for BRIDGE\n\ - set-controller [BRIDGE] TARGET set the controller for BRIDGE to TARGET\n\ - get-fail-mode [BRIDGE] print the fail-mode for BRIDGE\n\ - del-fail-mode [BRIDGE] delete the fail-mode for BRIDGE\n\ - set-fail-mode [BRIDGE] MODE set the fail-mode for BRIDGE to MODE\n\ + get-controller BRIDGE print the controller for BRIDGE\n\ + del-controller BRIDGE delete the controller for BRIDGE\n\ + set-controller BRIDGE TARGET set the controller for BRIDGE to TARGET\n\ + get-fail-mode BRIDGE print the fail-mode for BRIDGE\n\ + del-fail-mode BRIDGE delete the fail-mode for BRIDGE\n\ + set-fail-mode BRIDGE MODE set the fail-mode for BRIDGE to MODE\n\ \n\ SSL commands:\n\ get-ssl print the SSL configuration\n\ @@ -463,13 +462,14 @@ Switch commands:\n\ \n\ Database commands:\n\ list TBL [REC] list RECord (or all records) in TBL\n\ - get TBL REC COL[:KEY] print values of COLumns in RECORD in TBL\n\ + get TBL REC COL[:KEY] print values of COLumns in RECord in TBL\n\ set TBL REC COL[:KEY]=VALUE set COLumn values in RECord in TBL\n\ add TBL REC COL [KEY=]VALUE add (KEY=)VALUE to COLumn in RECord in TBL\n\ remove TBL REC COL [KEY=]VALUE remove (KEY=)VALUE from COLumn\n\ clear TBL REC COL clear values from COLumn in RECord in TBL\n\ create TBL COL[:KEY]=VALUE create and initialize new record\n\ - destroy TBL REC delete REC from TBL\n\ + destroy TBL REC delete RECord from TBL\n\ + wait-until TBL REC [COL[:KEY]=VALUE] wait until condition is true\n\ Potentially unsafe database commands require --force option.\n\ \n\ Options:\n\ @@ -507,12 +507,17 @@ struct vsctl_context { struct ovsdb_idl_txn *txn; struct ovsdb_symbol_table *symtab; const struct ovsrec_open_vswitch *ovs; + + /* A command may set this member to true if some prerequisite is not met + * and the caller should wait for something to change and then retry. */ + bool try_again; }; struct vsctl_bridge { struct ovsrec_bridge *br_cfg; char *name; struct ovsrec_controller **ctrl; + char *fail_mode; size_t n_ctrl; struct vsctl_bridge *parent; int vlan; @@ -532,8 +537,6 @@ struct vsctl_info { struct shash bridges; struct shash ports; struct shash ifaces; - struct ovsrec_controller **ctrl; - size_t n_ctrl; }; static char * @@ -573,9 +576,11 @@ add_bridge(struct vsctl_info *b, if (parent) { br->ctrl = parent->br_cfg->controller; br->n_ctrl = parent->br_cfg->n_controller; + br->fail_mode = parent->br_cfg->fail_mode; } else { br->ctrl = br_cfg->controller; br->n_ctrl = br_cfg->n_controller; + br->fail_mode = br_cfg->fail_mode; } shash_add(&b->bridges, br->name, br); return br; @@ -631,9 +636,6 @@ get_info(const struct ovsrec_open_vswitch *ovs, struct vsctl_info *info) shash_init(&info->ports); shash_init(&info->ifaces); - info->ctrl = ovs->controller; - info->n_ctrl = ovs->n_controller; - shash_init(&bridges); shash_init(&ports); for (i = 0; i < ovs->n_bridges; i++) { @@ -886,7 +888,6 @@ cmd_emer_reset(struct vsctl_context *ctx) /* Reset the Open_vSwitch table. */ ovsrec_open_vswitch_set_managers(ctx->ovs, NULL, 0); - ovsrec_open_vswitch_set_controller(ctx->ovs, NULL, 0); ovsrec_open_vswitch_set_ssl(ctx->ovs, NULL); OVSREC_BRIDGE_FOR_EACH (br, idl) { @@ -1542,20 +1543,21 @@ cmd_iface_to_br(struct vsctl_context *ctx) free_info(&info); } -/* Print targets of the 'n_controllers' in 'controllers' on the output for - * 'ctx'. */ static void -print_controllers(struct vsctl_context *ctx, - struct ovsrec_controller **controllers, - size_t n_controllers) +cmd_get_controller(struct vsctl_context *ctx) { - /* Print the targets in sorted order for reproducibility. */ + struct vsctl_info info; + struct vsctl_bridge *br; struct svec targets; size_t i; + get_info(ctx->ovs, &info); + br = find_bridge(&info, ctx->argv[1], true); + + /* Print the targets in sorted order for reproducibility. */ svec_init(&targets); - for (i = 0; i < n_controllers; i++) { - svec_add(&targets, controllers[i]->target); + for (i = 0; i < br->n_ctrl; i++) { + svec_add(&targets, br->ctrl[i]->target); } svec_sort(&targets); @@ -1563,25 +1565,6 @@ print_controllers(struct vsctl_context *ctx, ds_put_format(&ctx->output, "%s\n", targets.names[i]); } svec_destroy(&targets); -} - -static void -cmd_get_controller(struct vsctl_context *ctx) -{ - struct vsctl_info info; - - get_info(ctx->ovs, &info); - - if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) { - print_controllers(ctx, info.ctrl, info.n_ctrl); - } else { - struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); - if (br->n_ctrl) { - print_controllers(ctx, br->ctrl, br->n_ctrl); - } else { - print_controllers(ctx, info.ctrl, info.n_ctrl); - } - } free_info(&info); } @@ -1601,20 +1584,14 @@ static void cmd_del_controller(struct vsctl_context *ctx) { struct vsctl_info info; + struct vsctl_bridge *br; get_info(ctx->ovs, &info); + br = find_real_bridge(&info, ctx->argv[1], true); - if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) { - if (info.n_ctrl) { - delete_controllers(info.ctrl, info.n_ctrl); - ovsrec_open_vswitch_set_controller(ctx->ovs, NULL, 0); - } - } else { - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); - if (br->ctrl) { - delete_controllers(br->ctrl, br->n_ctrl); - ovsrec_bridge_set_controller(br->br_cfg, NULL, 0); - } + if (br->ctrl) { + delete_controllers(br->ctrl, br->n_ctrl); + ovsrec_bridge_set_controller(br->br_cfg, NULL, 0); } free_info(&info); @@ -1635,123 +1612,53 @@ insert_controllers(struct ovsdb_idl_txn *txn, char *targets[], size_t n) return controllers; } -static void -set_default_controllers(struct vsctl_context *ctx, char *targets[], size_t n) -{ - struct ovsrec_controller **controllers; - - delete_controllers(ctx->ovs->controller, ctx->ovs->n_controller); - - controllers = insert_controllers(ctx->txn, targets, n); - ovsrec_open_vswitch_set_controller(ctx->ovs, controllers, n); - free(controllers); -} - static void cmd_set_controller(struct vsctl_context *ctx) { struct vsctl_info info; + struct vsctl_bridge *br; + struct ovsrec_controller **controllers; + size_t n; get_info(ctx->ovs, &info); + br = find_real_bridge(&info, ctx->argv[1], true); - if (ctx->argc == 2) { - /* Set one controller in the "Open_vSwitch" table. */ - set_default_controllers(ctx, &ctx->argv[1], 1); - } else if (!strcmp(ctx->argv[1], "default")) { - /* Set one or more controllers in the "Open_vSwitch" table. */ - set_default_controllers(ctx, &ctx->argv[2], ctx->argc - 2); - } else { - /* Set one or more controllers for a particular bridge. */ - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); - struct ovsrec_controller **controllers; - size_t n; - - delete_controllers(br->ctrl, br->n_ctrl); + delete_controllers(br->ctrl, br->n_ctrl); - n = ctx->argc - 2; - controllers = insert_controllers(ctx->txn, &ctx->argv[2], n); - ovsrec_bridge_set_controller(br->br_cfg, controllers, n); - free(controllers); - } + n = ctx->argc - 2; + controllers = insert_controllers(ctx->txn, &ctx->argv[2], n); + ovsrec_bridge_set_controller(br->br_cfg, controllers, n); + free(controllers); free_info(&info); } -static const char * -get_fail_mode(struct ovsrec_controller **controllers, size_t n_controllers) -{ - const char *fail_mode; - size_t i; - - fail_mode = NULL; - for (i = 0; i < n_controllers; i++) { - const char *s = controllers[i]->fail_mode; - if (s) { - if (!strcmp(s, "secure")) { - return s; - } else { - fail_mode = s; - } - } - } - - return fail_mode; -} - static void cmd_get_fail_mode(struct vsctl_context *ctx) { struct vsctl_info info; - const char *fail_mode = NULL; + struct vsctl_bridge *br; get_info(ctx->ovs, &info); + br = find_bridge(&info, ctx->argv[1], true); - if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) { - /* Return the fail-mode from the "Open_vSwitch" table */ - fail_mode = get_fail_mode(info.ctrl, info.n_ctrl); - } else { - /* Return the fail-mode for a particular bridge. */ - struct vsctl_bridge *br = find_bridge(&info, ctx->argv[1], true); - - /* If no controller is defined for the requested bridge, fallback to - * the "Open_vSwitch" table's controller. */ - fail_mode = (br->n_ctrl - ? get_fail_mode(br->ctrl, br->n_ctrl) - : get_fail_mode(info.ctrl, info.n_ctrl)); - } - - if (fail_mode && strlen(fail_mode)) { - ds_put_format(&ctx->output, "%s\n", fail_mode); + if (br->fail_mode && strlen(br->fail_mode)) { + ds_put_format(&ctx->output, "%s\n", br->fail_mode); } free_info(&info); } -static void -set_fail_mode(struct ovsrec_controller **controllers, size_t n_controllers, - const char *fail_mode) -{ - size_t i; - - for (i = 0; i < n_controllers; i++) { - ovsrec_controller_set_fail_mode(controllers[i], fail_mode); - } -} - static void cmd_del_fail_mode(struct vsctl_context *ctx) { struct vsctl_info info; + struct vsctl_bridge *br; get_info(ctx->ovs, &info); + br = find_real_bridge(&info, ctx->argv[1], true); - if (ctx->argc == 1 || !strcmp(ctx->argv[1], "default")) { - set_fail_mode(info.ctrl, info.n_ctrl, NULL); - } else { - struct vsctl_bridge *br = find_real_bridge(&info, ctx->argv[1], true); - - set_fail_mode(br->ctrl, br->n_ctrl, NULL); - } + ovsrec_bridge_set_fail_mode(br->br_cfg, NULL); free_info(&info); } @@ -1760,37 +1667,17 @@ static void cmd_set_fail_mode(struct vsctl_context *ctx) { struct vsctl_info info; - const char *bridge; - const char *fail_mode; + struct vsctl_bridge *br; + const char *fail_mode = ctx->argv[2]; get_info(ctx->ovs, &info); - - if (ctx->argc == 2) { - bridge = "default"; - fail_mode = ctx->argv[1]; - } else { - bridge = ctx->argv[1]; - fail_mode = ctx->argv[2]; - } + br = find_real_bridge(&info, ctx->argv[1], true); if (strcmp(fail_mode, "standalone") && strcmp(fail_mode, "secure")) { vsctl_fatal("fail-mode must be \"standalone\" or \"secure\""); } - if (!strcmp(bridge, "default")) { - /* Set the fail-mode in the "Open_vSwitch" table. */ - if (!info.ctrl) { - vsctl_fatal("no controller declared"); - } - set_fail_mode(info.ctrl, info.n_ctrl, fail_mode); - } else { - struct vsctl_bridge *br = find_real_bridge(&info, bridge, true); - - if (!br->ctrl) { - vsctl_fatal("no controller declared for %s", br->name); - } - set_fail_mode(br->ctrl, br->n_ctrl, fail_mode); - } + ovsrec_bridge_set_fail_mode(br->br_cfg, fail_mode); free_info(&info); } @@ -1861,10 +1748,7 @@ static const struct vsctl_table_class tables[] = { {&ovsrec_table_controller, {{&ovsrec_table_bridge, &ovsrec_bridge_col_name, - &ovsrec_bridge_col_controller}, - {&ovsrec_table_open_vswitch, - NULL, - &ovsrec_open_vswitch_col_controller}}}, + &ovsrec_bridge_col_controller}}}, {&ovsrec_table_interface, {{&ovsrec_table_interface, &ovsrec_interface_col_name, NULL}, @@ -1986,34 +1870,23 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, } } else { const struct ovsdb_idl_row *row; - unsigned int best_score = 0; - - /* It might make sense to relax this assertion. */ - assert(id->name_column->type.key.type == OVSDB_TYPE_STRING); referrer = NULL; for (row = ovsdb_idl_first_row(ctx->idl, id->table); - row != NULL && best_score != UINT_MAX; + row != NULL; row = ovsdb_idl_next_row(row)) { - struct ovsdb_datum name; - - ovsdb_idl_txn_read(row, id->name_column, &name); - if (name.n == 1) { - unsigned int score = score_partial_match(name.keys[0].string, - record_id); - if (score > best_score) { - referrer = row; - best_score = score; - } else if (score == best_score) { - referrer = NULL; + const struct ovsdb_datum *name; + + name = ovsdb_idl_get(row, id->name_column, + OVSDB_TYPE_STRING, OVSDB_TYPE_VOID); + if (name->n == 1 && !strcmp(name->keys[0].string, record_id)) { + if (referrer) { + vsctl_fatal("multiple rows in %s match \"%s\"", + table->class->name, record_id); } + referrer = row; } - ovsdb_datum_destroy(&name, &id->name_column->type); - } - if (best_score && !referrer) { - vsctl_fatal("multiple rows in %s match \"%s\"", - table->class->name, record_id); } } if (!referrer) { @@ -2022,17 +1895,14 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, final = NULL; if (id->uuid_column) { - struct ovsdb_datum uuid; + const struct ovsdb_datum *uuid; - assert(id->uuid_column->type.key.type == OVSDB_TYPE_UUID); - assert(id->uuid_column->type.value.type == OVSDB_TYPE_VOID); - - ovsdb_idl_txn_read(referrer, id->uuid_column, &uuid); - if (uuid.n == 1) { + uuid = ovsdb_idl_get(referrer, id->uuid_column, + OVSDB_TYPE_UUID, OVSDB_TYPE_VOID); + if (uuid->n == 1) { final = ovsdb_idl_get_row_for_uuid(ctx->idl, table->class, - &uuid.keys[0].uuid); + &uuid->keys[0].uuid); } - ovsdb_datum_destroy(&uuid, &id->uuid_column->type); } else { final = referrer; } @@ -2041,8 +1911,8 @@ get_row_by_id(struct vsctl_context *ctx, const struct vsctl_table_class *table, } static const struct ovsdb_idl_row * -get_row(struct vsctl_context *ctx, - const struct vsctl_table_class *table, const char *record_id) +get_row (struct vsctl_context *ctx, + const struct vsctl_table_class *table, const char *record_id) { const struct ovsdb_idl_row *row; struct uuid uuid; @@ -2105,15 +1975,65 @@ get_column(const struct vsctl_table_class *table, const char *column_name, } } +static char * +missing_operator_error(const char *arg, const char **allowed_operators, + size_t n_allowed) +{ + struct ds s; + + ds_init(&s); + ds_put_format(&s, "%s: argument does not end in ", arg); + ds_put_format(&s, "\"%s\"", allowed_operators[0]); + if (n_allowed == 2) { + ds_put_format(&s, " or \"%s\"", allowed_operators[1]); + } else if (n_allowed > 2) { + size_t i; + + for (i = 1; i < n_allowed - 1; i++) { + ds_put_format(&s, ", \"%s\"", allowed_operators[i]); + } + ds_put_format(&s, ", or \"%s\"", allowed_operators[i]); + } + ds_put_format(&s, " followed by a value."); + + return ds_steal_cstr(&s); +} + +/* 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. + * + * - 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'. + * + * - If 'valuep' is nonnull, an operator followed by a value string. The + * allowed operators are the 'n_allowed' string in 'allowed_operators', + * or just "=" if 'n_allowed' is 0. If 'operatorp' is nonnull, then the + * operator is stored into '*operatorp' (one of the pointers from + * 'allowed_operators' is stored; nothing is malloc()'d). The value is + * 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 -parse_column_key_value(const char *arg, const struct vsctl_table_class *table, - const struct ovsdb_idl_column **columnp, - char **keyp, char **valuep) +parse_column_key_value(const char *arg, + const struct vsctl_table_class *table, + const struct ovsdb_idl_column **columnp, char **keyp, + const char **operatorp, + const char **allowed_operators, size_t n_allowed, + char **valuep) { const char *p = arg; char *error; assert(columnp || keyp); + assert(!(operatorp && !valuep)); if (keyp) { *keyp = NULL; } @@ -2158,12 +2078,37 @@ parse_column_key_value(const char *arg, const struct vsctl_table_class *table, } /* Parse value string. */ - if (*p == '=') { - if (!valuep) { - error = xasprintf("%s: value not accepted here", arg); + if (valuep) { + const char *best; + size_t best_len; + size_t i; + + if (!allowed_operators) { + static const char *equals = "="; + allowed_operators = = + n_allowed = 1; + } + + best = NULL; + best_len = 0; + for (i = 0; i < n_allowed; i++) { + const char *op = allowed_operators[i]; + size_t op_len = strlen(op); + + if (op_len > best_len && !strncmp(op, p, op_len) && p[op_len]) { + best_len = op_len; + best = op; + } + } + if (!best) { + error = missing_operator_error(arg, allowed_operators, n_allowed); goto error; } - *valuep = xstrdup(p + 1); + + if (operatorp) { + *operatorp = best; + } + *valuep = xstrdup(p + best_len); } else { if (valuep) { *valuep = NULL; @@ -2187,6 +2132,9 @@ error: if (valuep) { free(*valuep); *valuep = NULL; + if (operatorp) { + *operatorp = NULL; + } } return error; } @@ -2206,7 +2154,7 @@ cmd_get(struct vsctl_context *ctx) row = must_get_row(ctx, table, record_id); for (i = 3; i < ctx->argc; i++) { const struct ovsdb_idl_column *column; - struct ovsdb_datum datum; + const struct ovsdb_datum *datum; char *key_string; /* Special case for obtaining the UUID of a row. We can't just do this @@ -2219,9 +2167,10 @@ cmd_get(struct vsctl_context *ctx) } die_if_error(parse_column_key_value(ctx->argv[i], table, - &column, &key_string, NULL)); + &column, &key_string, + NULL, NULL, 0, NULL)); - ovsdb_idl_txn_read(row, column, &datum); + datum = ovsdb_idl_read(row, column); if (key_string) { union ovsdb_atom key; unsigned int idx; @@ -2235,7 +2184,7 @@ cmd_get(struct vsctl_context *ctx) &column->type.key, key_string, ctx->symtab)); - idx = ovsdb_datum_find_key(&datum, &key, + idx = ovsdb_datum_find_key(datum, &key, column->type.key.type); if (idx == UINT_MAX) { if (!if_exists) { @@ -2244,15 +2193,14 @@ cmd_get(struct vsctl_context *ctx) column->name); } } else { - ovsdb_atom_to_string(&datum.values[idx], + ovsdb_atom_to_string(&datum->values[idx], column->type.value.type, out); } ovsdb_atom_destroy(&key, column->type.key.type); } else { - ovsdb_datum_to_string(&datum, &column->type, out); + ovsdb_datum_to_string(datum, &column->type, out); } ds_put_char(out, '\n'); - ovsdb_datum_destroy(&datum, &column->type); free(key_string); } @@ -2268,15 +2216,13 @@ list_record(const struct vsctl_table_class *table, UUID_ARGS(&row->uuid)); for (i = 0; i < table->class->n_columns; i++) { const struct ovsdb_idl_column *column = &table->class->columns[i]; - struct ovsdb_datum datum; + const struct ovsdb_datum *datum; - ovsdb_idl_txn_read(row, column, &datum); + datum = ovsdb_idl_read(row, column); ds_put_format(out, "%-20s: ", column->name); - ovsdb_datum_to_string(&datum, &column->type, out); + ovsdb_datum_to_string(datum, &column->type, out); ds_put_char(out, '\n'); - - ovsdb_datum_destroy(&datum, &column->type); } } @@ -2321,7 +2267,7 @@ set_column(const struct vsctl_table_class *table, char *error; error = parse_column_key_value(arg, table, &column, &key_string, - &value_string); + NULL, NULL, 0, &value_string); die_if_error(error); if (!value_string) { vsctl_fatal("%s: missing value", arg); @@ -2329,7 +2275,7 @@ set_column(const struct vsctl_table_class *table, if (key_string) { union ovsdb_atom key, value; - struct ovsdb_datum old, new; + struct ovsdb_datum datum; if (column->type.value.type == OVSDB_TYPE_VOID) { vsctl_fatal("cannot specify key to set for non-map column %s", @@ -2341,17 +2287,15 @@ set_column(const struct vsctl_table_class *table, die_if_error(ovsdb_atom_from_string(&value, &column->type.value, value_string, symtab)); - ovsdb_datum_init_empty(&new); - ovsdb_datum_add_unsafe(&new, &key, &value, &column->type); + ovsdb_datum_init_empty(&datum); + ovsdb_datum_add_unsafe(&datum, &key, &value, &column->type); ovsdb_atom_destroy(&key, column->type.key.type); ovsdb_atom_destroy(&value, column->type.value.type); - ovsdb_idl_txn_read(row, column, &old); - ovsdb_datum_union(&old, &new, &column->type, true); - ovsdb_idl_txn_write(row, column, &old); - - ovsdb_datum_destroy(&new, &column->type); + ovsdb_datum_union(&datum, ovsdb_idl_read(row, column), + &column->type, false); + ovsdb_idl_txn_write(row, column, &datum); } else { struct ovsdb_datum datum; @@ -2398,7 +2342,7 @@ cmd_add(struct vsctl_context *ctx) die_if_error(get_column(table, column_name, &column)); type = &column->type; - ovsdb_idl_txn_read(row, column, &old); + ovsdb_datum_clone(&old, ovsdb_idl_read(row, column), &column->type); for (i = 4; i < ctx->argc; i++) { struct ovsdb_type add_type; struct ovsdb_datum add; @@ -2439,7 +2383,7 @@ cmd_remove(struct vsctl_context *ctx) die_if_error(get_column(table, column_name, &column)); type = &column->type; - ovsdb_idl_txn_read(row, column, &old); + ovsdb_datum_clone(&old, ovsdb_idl_read(row, column), &column->type); for (i = 4; i < ctx->argc; i++) { struct ovsdb_type rm_type; struct ovsdb_datum rm; @@ -2578,6 +2522,104 @@ cmd_destroy(struct vsctl_context *ctx) } } } + +static bool +is_condition_satified(const struct vsctl_table_class *table, + const struct ovsdb_idl_row *row, const char *arg, + struct ovsdb_symbol_table *symtab) +{ + static const char *operators[] = { + "=", "!=", "<", ">", "<=", ">=" + }; + + const struct ovsdb_idl_column *column; + const struct ovsdb_datum *have_datum; + char *key_string, *value_string; + const char *operator; + unsigned int idx; + char *error; + int cmp = 0; + + error = parse_column_key_value(arg, table, &column, &key_string, + &operator, operators, ARRAY_SIZE(operators), + &value_string); + die_if_error(error); + if (!value_string) { + vsctl_fatal("%s: missing value", arg); + } + + have_datum = ovsdb_idl_read(row, column); + if (key_string) { + union ovsdb_atom want_key, want_value; + + if (column->type.value.type == OVSDB_TYPE_VOID) { + vsctl_fatal("cannot specify key to check for non-map column %s", + column->name); + } + + die_if_error(ovsdb_atom_from_string(&want_key, &column->type.key, + key_string, symtab)); + die_if_error(ovsdb_atom_from_string(&want_value, &column->type.value, + value_string, symtab)); + + idx = ovsdb_datum_find_key(have_datum, + &want_key, column->type.key.type); + if (idx != UINT_MAX) { + cmp = ovsdb_atom_compare_3way(&have_datum->values[idx], + &want_value, + column->type.value.type); + } + + ovsdb_atom_destroy(&want_key, column->type.key.type); + ovsdb_atom_destroy(&want_value, column->type.value.type); + } else { + struct ovsdb_datum want_datum; + + die_if_error(ovsdb_datum_from_string(&want_datum, &column->type, + value_string, symtab)); + idx = 0; + cmp = ovsdb_datum_compare_3way(have_datum, &want_datum, + &column->type); + ovsdb_datum_destroy(&want_datum, &column->type); + } + + free(key_string); + free(value_string); + + return (idx == UINT_MAX ? false + : !strcmp(operator, "=") ? cmp == 0 + : !strcmp(operator, "!=") ? cmp != 0 + : !strcmp(operator, "<") ? cmp < 0 + : !strcmp(operator, ">") ? cmp > 0 + : !strcmp(operator, "<=") ? cmp <= 0 + : !strcmp(operator, ">=") ? cmp >= 0 + : (abort(), 0)); +} + +static void +cmd_wait_until(struct vsctl_context *ctx) +{ + const char *table_name = ctx->argv[1]; + const char *record_id = ctx->argv[2]; + const struct vsctl_table_class *table; + const struct ovsdb_idl_row *row; + int i; + + table = get_table(table_name); + + row = get_row(ctx, table, record_id); + if (!row) { + ctx->try_again = true; + return; + } + + for (i = 3; i < ctx->argc; i++) { + if (!is_condition_satified(table, row, ctx->argv[i], ctx->symtab)) { + ctx->try_again = true; + return; + } + } +} static struct json * where_uuid_equals(const struct uuid *uuid) @@ -2608,6 +2650,8 @@ vsctl_context_init(struct vsctl_context *ctx, struct vsctl_command *command, ctx->txn = txn; ctx->ovs = ovs; ctx->symtab = symtab; + + ctx->try_again = false; } static void @@ -2627,7 +2671,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, const char *unused; struct vsctl_command *c; int64_t next_cfg = 0; - char *error; + char *error = NULL; txn = the_idl_txn = ovsdb_idl_txn_create(idl); if (dry_run) { @@ -2649,13 +2693,19 @@ 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); + } for (c = commands; c < &commands[n_commands]; c++) { struct vsctl_context ctx; - ds_init(&c->output); vsctl_context_init(&ctx, c, idl, txn, ovs, symtab); (c->syntax->run)(&ctx); vsctl_context_done(&ctx, c); + + if (ctx.try_again) { + goto try_again; + } } status = ovsdb_idl_txn_commit_block(txn); @@ -2682,7 +2732,6 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, vsctl_fatal("row id \"%s\" is referenced but never created (e.g. " "with \"-- --id=%s create ...\")", unused, unused); } - ovsdb_symbol_table_destroy(symtab); switch (status) { case TXN_INCOMPLETE: @@ -2697,11 +2746,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, break; case TXN_TRY_AGAIN: - for (c = commands; c < &commands[n_commands]; c++) { - ds_destroy(&c->output); - } - free(error); - return; + goto try_again; case TXN_ERROR: vsctl_fatal("transaction error: %s", error); @@ -2711,6 +2756,8 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, } free(error); + ovsdb_symbol_table_destroy(symtab); + for (c = commands; c < &commands[n_commands]; c++) { struct ds *ds = &c->output; struct shash_node *node; @@ -2765,6 +2812,17 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, ovsdb_idl_destroy(idl); exit(EXIT_SUCCESS); + +try_again: + /* Our transaction needs to be rerun, or a prerequisite was not met. Free + * resources and return so that the caller can try again. */ + ovsdb_idl_txn_abort(txn); + ovsdb_idl_txn_destroy(txn); + ovsdb_symbol_table_destroy(symtab); + for (c = commands; c < &commands[n_commands]; c++) { + ds_destroy(&c->output); + } + free(error); } static const struct vsctl_command_syntax all_commands[] = { @@ -2793,12 +2851,12 @@ static const struct vsctl_command_syntax all_commands[] = { {"iface-to-br", 1, 1, cmd_iface_to_br, NULL, ""}, /* Controller commands. */ - {"get-controller", 0, 1, cmd_get_controller, NULL, ""}, - {"del-controller", 0, 1, cmd_del_controller, NULL, ""}, + {"get-controller", 1, 1, cmd_get_controller, NULL, ""}, + {"del-controller", 1, 1, cmd_del_controller, NULL, ""}, {"set-controller", 1, INT_MAX, cmd_set_controller, NULL, ""}, - {"get-fail-mode", 0, 1, cmd_get_fail_mode, NULL, ""}, - {"del-fail-mode", 0, 1, cmd_del_fail_mode, NULL, ""}, - {"set-fail-mode", 1, 2, cmd_set_fail_mode, NULL, ""}, + {"get-fail-mode", 1, 1, cmd_get_fail_mode, NULL, ""}, + {"del-fail-mode", 1, 1, cmd_del_fail_mode, NULL, ""}, + {"set-fail-mode", 2, 2, cmd_set_fail_mode, NULL, ""}, /* SSL commands. */ {"get-ssl", 0, 0, cmd_get_ssl, NULL, ""}, @@ -2817,6 +2875,7 @@ static const struct vsctl_command_syntax all_commands[] = { {"clear", 3, INT_MAX, cmd_clear, NULL, ""}, {"create", 2, INT_MAX, cmd_create, post_create, "--id="}, {"destroy", 1, INT_MAX, cmd_destroy, NULL, "--if-exists"}, + {"wait-until", 2, INT_MAX, cmd_wait_until, NULL, ""}, {NULL, 0, 0, NULL, NULL, NULL}, };