-/* Copyright (c) 2009 Nicira Networks.
+/* Copyright (c) 2009, 2010 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <assert.h>
#include <errno.h>
+#include <inttypes.h>
#include <limits.h>
#include <stdlib.h>
#include "bitmap.h"
+#include "dynamic-string.h"
#include "json.h"
#include "jsonrpc.h"
#include "ovsdb-data.h"
struct hmap txn_rows;
enum ovsdb_idl_txn_status status;
bool dry_run;
+ struct ds comment;
+
+ /* Increments. */
+ char *inc_table;
+ char *inc_column;
+ struct json *inc_where;
+ unsigned int inc_index;
+ int64_t inc_new_value;
};
static struct vlog_rate_limit syntax_rl = VLOG_RATE_LIMIT_INIT(1, 5);
const struct uuid *);
static void ovsdb_idl_row_destroy(struct ovsdb_idl_row *);
+static void ovsdb_idl_row_parse(struct ovsdb_idl_row *);
+static void ovsdb_idl_row_unparse(struct ovsdb_idl_row *);
static void ovsdb_idl_row_clear_old(struct ovsdb_idl_row *);
static void ovsdb_idl_row_clear_new(struct ovsdb_idl_row *);
struct ovsdb_idl_arc *arc, *next_arc;
if (!ovsdb_idl_row_is_orphan(row)) {
- (row->table->class->unparse)(row);
+ ovsdb_idl_row_unparse(row);
ovsdb_idl_row_clear_old(row);
}
hmap_remove(&table->rows, &row->hmap_node);
}
reply = NULL;
- if (msg->type == JSONRPC_REQUEST && !strcmp(msg->method, "echo")) {
- reply = jsonrpc_create_reply(json_clone(msg->params), msg->id);
- } else if (msg->type == JSONRPC_NOTIFY
+ if (msg->type == JSONRPC_NOTIFY
&& !strcmp(msg->method, "update")
&& msg->params->type == JSON_ARRAY
&& msg->params->u.array.n == 2
&& ovsdb_idl_txn_process_reply(idl, msg)) {
/* ovsdb_idl_txn_process_reply() did everything needful. */
} else {
- VLOG_WARN("%s: received unexpected %s message",
- jsonrpc_session_get_name(idl->session),
- jsonrpc_msg_type_to_string(msg->type));
- jsonrpc_session_force_reconnect(idl->session);
+ /* This can happen if ovsdb_idl_txn_destroy() is called to destroy
+ * a transaction before we receive the reply, so keep the log level
+ * low. */
+ VLOG_DBG("%s: received unexpected %s message",
+ jsonrpc_session_get_name(idl->session),
+ jsonrpc_msg_type_to_string(msg->type));
}
if (reply) {
jsonrpc_session_send(idl->session, reply);
return idl->change_seqno;
}
+bool
+ovsdb_idl_has_ever_connected(const struct ovsdb_idl *idl)
+{
+ return ovsdb_idl_get_seqno(idl) != 0;
+}
+
void
ovsdb_idl_force_reconnect(struct ovsdb_idl *idl)
{
return !row->old;
}
+static void
+ovsdb_idl_row_parse(struct ovsdb_idl_row *row)
+{
+ const struct ovsdb_idl_table_class *class = row->table->class;
+ size_t i;
+
+ for (i = 0; i < class->n_columns; i++) {
+ const struct ovsdb_idl_column *c = &class->columns[i];
+ (c->parse)(row, &row->old[i]);
+ }
+}
+
+static void
+ovsdb_idl_row_unparse(struct ovsdb_idl_row *row)
+{
+ const struct ovsdb_idl_table_class *class = row->table->class;
+ size_t i;
+
+ for (i = 0; i < class->n_columns; i++) {
+ const struct ovsdb_idl_column *c = &class->columns[i];
+ (c->unparse)(row);
+ }
+}
+
static void
ovsdb_idl_row_clear_old(struct ovsdb_idl_row *row)
{
/* This is trickier than it looks. ovsdb_idl_row_clear_arcs() will destroy
* 'arc', so we need to use the "safe" variant of list traversal. However,
- * calling ref->table->class->parse will add an arc equivalent to 'arc' to
- * row->arcs. That could be a problem for traversal, but it adds it at the
- * beginning of the list to prevent us from stumbling upon it again.
+ * calling an ovsdb_idl_column's 'parse' function will add an arc
+ * equivalent to 'arc' to row->arcs. That could be a problem for
+ * traversal, but it adds it at the beginning of the list to prevent us
+ * from stumbling upon it again.
*
* (If duplicate arcs were possible then we would need to make sure that
* 'next' didn't also point into 'arc''s destination, but we forbid
&row->dst_arcs) {
struct ovsdb_idl_row *ref = arc->src;
- (ref->table->class->unparse)(ref);
+ ovsdb_idl_row_unparse(ref);
ovsdb_idl_row_clear_arcs(ref, destroy_dsts);
- (ref->table->class->parse)(ref);
+ ovsdb_idl_row_parse(ref);
}
}
ovsdb_idl_row_create__(const struct ovsdb_idl_table_class *class)
{
struct ovsdb_idl_row *row = xzalloc(class->allocation_size);
- memset(row, 0, sizeof *row);
list_init(&row->src_arcs);
list_init(&row->dst_arcs);
hmap_node_nullify(&row->txn_node);
ovsdb_datum_init_default(&row->old[i], &class->columns[i].type);
}
ovsdb_idl_row_update(row, row_json);
- (class->parse)(row);
+ ovsdb_idl_row_parse(row);
ovsdb_idl_row_reparse_backrefs(row, false);
}
static void
ovsdb_idl_delete_row(struct ovsdb_idl_row *row)
{
- (row->table->class->unparse)(row);
+ ovsdb_idl_row_unparse(row);
ovsdb_idl_row_clear_arcs(row, true);
ovsdb_idl_row_clear_old(row);
if (list_is_empty(&row->dst_arcs)) {
static void
ovsdb_idl_modify_row(struct ovsdb_idl_row *row, const struct json *row_json)
{
- (row->table->class->unparse)(row);
+ ovsdb_idl_row_unparse(row);
ovsdb_idl_row_clear_arcs(row, true);
ovsdb_idl_row_update(row, row_json);
- (row->table->class->parse)(row);
+ ovsdb_idl_row_parse(row);
}
static bool
*
* We only need to test whether the first arc in dst->dst_arcs originates
* at 'src', since we add all of the arcs from a given source in a clump
- * (in a single call to a row's ->parse function) and new arcs are always
+ * (in a single call to ovsdb_idl_row_parse()) and new arcs are always
* added at the front of the dst_arcs list. */
if (list_is_empty(&dst->dst_arcs)) {
return true;
dst_table = ovsdb_idl_table_from_class(idl, dst_table_class);
dst = ovsdb_idl_get_row(dst_table, dst_uuid);
- if (!dst) {
- dst = ovsdb_idl_row_create(dst_table, dst_uuid);
- }
+ if (idl->txn) {
+ /* We're being called from ovsdb_idl_txn_write(). We must not update
+ * any arcs, because the transaction will be backed out at commit or
+ * abort time and we don't want our graph screwed up.
+ *
+ * Just return the destination row, if there is one and it has not been
+ * deleted. */
+ if (dst && (hmap_node_is_null(&dst->txn_node) || dst->new)) {
+ return dst;
+ }
+ return NULL;
+ } else {
+ /* We're being called from some other context. Update the graph. */
+ if (!dst) {
+ dst = ovsdb_idl_row_create(dst_table, dst_uuid);
+ }
- /* Add a new arc, if it wouldn't be a self-arc or a duplicate arc. */
- if (may_add_arc(src, dst)) {
- /* The arc *must* be added at the front of the dst_arcs list. See
- * ovsdb_idl_row_reparse_backrefs() for details. */
- arc = xmalloc(sizeof *arc);
- list_push_front(&src->src_arcs, &arc->src_node);
- list_push_front(&dst->dst_arcs, &arc->dst_node);
- arc->src = src;
- arc->dst = dst;
+ /* Add a new arc, if it wouldn't be a self-arc or a duplicate arc. */
+ if (may_add_arc(src, dst)) {
+ /* The arc *must* be added at the front of the dst_arcs list. See
+ * ovsdb_idl_row_reparse_backrefs() for details. */
+ arc = xmalloc(sizeof *arc);
+ list_push_front(&src->src_arcs, &arc->src_node);
+ list_push_front(&dst->dst_arcs, &arc->dst_node);
+ arc->src = src;
+ arc->dst = dst;
+ }
+
+ return !ovsdb_idl_row_is_orphan(dst) ? dst : NULL;
}
+}
- return !ovsdb_idl_row_is_orphan(dst) ? dst : NULL;
+const struct ovsdb_idl_row *
+ovsdb_idl_get_row_for_uuid(const struct ovsdb_idl *idl,
+ const struct ovsdb_idl_table_class *tc,
+ const struct uuid *uuid)
+{
+ return ovsdb_idl_get_row(ovsdb_idl_table_from_class(idl, tc), uuid);
}
static struct ovsdb_idl_row *
struct ovsdb_idl_row *row;
row = CONTAINER_OF(node, struct ovsdb_idl_row, hmap_node);
- if (!ovsdb_idl_row_is_orphan(row)) {
+ if (row->new || !ovsdb_idl_row_is_orphan(row)) {
return row;
}
}
return NULL;
}
-struct ovsdb_idl_row *
+const struct ovsdb_idl_row *
ovsdb_idl_first_row(const struct ovsdb_idl *idl,
const struct ovsdb_idl_table_class *table_class)
{
return next_real_row(table, hmap_first(&table->rows));
}
-struct ovsdb_idl_row *
+const struct ovsdb_idl_row *
ovsdb_idl_next_row(const struct ovsdb_idl_row *row)
{
struct ovsdb_idl_table *table = row->table;
ovsdb_idl_txn_status_to_string(enum ovsdb_idl_txn_status status)
{
switch (status) {
+ case TXN_UNCHANGED:
+ return "unchanged";
case TXN_INCOMPLETE:
return "incomplete";
case TXN_ABORTED:
txn->status = TXN_INCOMPLETE;
hmap_init(&txn->txn_rows);
txn->dry_run = false;
+ ds_init(&txn->comment);
+ txn->inc_table = NULL;
+ txn->inc_column = NULL;
+ txn->inc_where = NULL;
return txn;
}
+void
+ovsdb_idl_txn_add_comment(struct ovsdb_idl_txn *txn, const char *s)
+{
+ if (txn->comment.length) {
+ ds_put_char(&txn->comment, '\n');
+ }
+ ds_put_cstr(&txn->comment, s);
+}
+
void
ovsdb_idl_txn_set_dry_run(struct ovsdb_idl_txn *txn)
{
txn->dry_run = true;
}
+void
+ovsdb_idl_txn_increment(struct ovsdb_idl_txn *txn, const char *table,
+ const char *column, const struct json *where)
+{
+ assert(!txn->inc_table);
+ txn->inc_table = xstrdup(table);
+ txn->inc_column = xstrdup(column);
+ txn->inc_where = where ? json_clone(where) : json_array_create_empty();
+}
+
void
ovsdb_idl_txn_destroy(struct ovsdb_idl_txn *txn)
{
+ if (txn->status == TXN_INCOMPLETE) {
+ hmap_remove(&txn->idl->outstanding_txns, &txn->hmap_node);
+ }
ovsdb_idl_txn_abort(txn);
+ ds_destroy(&txn->comment);
+ free(txn->inc_table);
+ free(txn->inc_column);
+ json_destroy(txn->inc_where);
free(txn);
}
{
struct ovsdb_idl_row *row, *next;
+ /* This must happen early. Otherwise, ovsdb_idl_row_parse() will call an
+ * ovsdb_idl_column's 'parse' function, which will call
+ * ovsdb_idl_get_row_arc(), which will seen that the IDL is in a
+ * transaction and fail to update the graph. */
+ txn->idl->txn = NULL;
+
HMAP_FOR_EACH_SAFE (row, next, struct ovsdb_idl_row, txn_node,
&txn->txn_rows) {
- if (row->old && row->written) {
- (row->table->class->unparse)(row);
- ovsdb_idl_row_clear_arcs(row, false);
- (row->table->class->parse)(row);
+ if (row->old) {
+ if (row->written) {
+ ovsdb_idl_row_unparse(row);
+ ovsdb_idl_row_clear_arcs(row, false);
+ ovsdb_idl_row_parse(row);
+ }
+ } else {
+ hmap_remove(&row->table->rows, &row->hmap_node);
}
ovsdb_idl_row_clear_new(row);
BITMAP_FOR_EACH_1 (idx, class->n_columns, row->written) {
const struct ovsdb_idl_column *column = &class->columns[idx];
- if (!row->old || !ovsdb_datum_equals(&row->old[idx],
- &row->new[idx],
- &column->type)) {
+ if (row->old
+ ? !ovsdb_datum_equals(&row->old[idx], &row->new[idx],
+ &column->type)
+ : !ovsdb_datum_is_default(&row->new[idx], &column->type)) {
json_object_put(row_json, column->name,
substitute_uuids(
ovsdb_datum_to_json(&row->new[idx],
}
}
+ /* Add increment. */
+ if (txn->inc_table && any_updates) {
+ struct json *op;
+
+ txn->inc_index = operations->u.array.n;
+
+ op = json_object_create();
+ json_object_put_string(op, "op", "mutate");
+ json_object_put_string(op, "table", txn->inc_table);
+ json_object_put(op, "where",
+ substitute_uuids(json_clone(txn->inc_where), txn));
+ json_object_put(op, "mutations",
+ json_array_create_1(
+ json_array_create_3(
+ json_string_create(txn->inc_column),
+ json_string_create("+="),
+ json_integer_create(1))));
+ json_array_add(operations, op);
+
+ op = json_object_create();
+ json_object_put_string(op, "op", "select");
+ json_object_put_string(op, "table", txn->inc_table);
+ json_object_put(op, "where",
+ substitute_uuids(json_clone(txn->inc_where), txn));
+ json_object_put(op, "columns",
+ json_array_create_1(json_string_create(
+ txn->inc_column)));
+ json_array_add(operations, op);
+ }
+
+ if (txn->comment.length) {
+ struct json *op = json_object_create();
+ json_object_put_string(op, "op", "comment");
+ json_object_put_string(op, "comment", ds_cstr(&txn->comment));
+ json_array_add(operations, op);
+ }
+
if (txn->dry_run) {
struct json *op = json_object_create();
json_object_put_string(op, "op", "abort");
}
if (!any_updates) {
- txn->status = TXN_SUCCESS;
+ txn->status = TXN_UNCHANGED;
+ json_destroy(operations);
} else if (!jsonrpc_session_send(
txn->idl->session,
jsonrpc_create_request(
txn->status = TXN_INCOMPLETE;
}
- txn->idl->txn = NULL;
ovsdb_idl_txn_disassemble(txn);
return txn->status;
}
+int64_t
+ovsdb_idl_txn_get_increment_new_value(const struct ovsdb_idl_txn *txn)
+{
+ assert(txn->status == TXN_SUCCESS);
+ return txn->inc_new_value;
+}
+
void
ovsdb_idl_txn_abort(struct ovsdb_idl_txn *txn)
{
}
void
-ovsdb_idl_txn_write(struct ovsdb_idl_row *row,
+ovsdb_idl_txn_read(const struct ovsdb_idl_row *row,
+ const struct ovsdb_idl_column *column,
+ struct ovsdb_datum *datum)
+{
+ const struct ovsdb_idl_table_class *class = row->table->class;
+ size_t column_idx = column - class->columns;
+
+ assert(row->new != NULL);
+ if (row->written && bitmap_is_set(row->written, column_idx)) {
+ ovsdb_datum_clone(datum, &row->new[column_idx], &column->type);
+ } else if (row->old) {
+ ovsdb_datum_clone(datum, &row->old[column_idx], &column->type);
+ } else {
+ ovsdb_datum_init_default(datum, &column->type);
+ }
+}
+
+void
+ovsdb_idl_txn_write(const struct ovsdb_idl_row *row_,
const struct ovsdb_idl_column *column,
struct ovsdb_datum *datum)
{
+ struct ovsdb_idl_row *row = (struct ovsdb_idl_row *) row_;
const struct ovsdb_idl_table_class *class = row->table->class;
size_t column_idx = column - class->columns;
- assert(row->new);
+ assert(row->new != NULL);
if (hmap_node_is_null(&row->txn_node)) {
hmap_insert(&row->table->idl->txn->txn_rows, &row->txn_node,
uuid_hash(&row->uuid));
bitmap_set1(row->written, column_idx);
}
row->new[column_idx] = *datum;
+ (column->unparse)(row);
+ (column->parse)(row, &row->new[column_idx]);
}
void
const struct ovsdb_idl_table_class *class = row->table->class;
size_t column_idx = column - class->columns;
- assert(row->new);
+ assert(row->new != NULL);
if (!row->old
|| (row->written && bitmap_is_set(row->written, column_idx))) {
return;
}
void
-ovsdb_idl_txn_delete(struct ovsdb_idl_row *row)
+ovsdb_idl_txn_delete(const struct ovsdb_idl_row *row_)
{
- assert(row->new);
+ struct ovsdb_idl_row *row = (struct ovsdb_idl_row *) row_;
+
+ assert(row->new != NULL);
if (!row->old) {
ovsdb_idl_row_clear_new(row);
assert(!row->prereqs);
+ hmap_remove(&row->table->rows, &row->hmap_node);
hmap_remove(&row->table->idl->txn->txn_rows, &row->txn_node);
free(row);
+ return;
}
if (hmap_node_is_null(&row->txn_node)) {
hmap_insert(&row->table->idl->txn->txn_rows, &row->txn_node,
uuid_hash(&row->uuid));
}
- if (row->new == row->old) {
- row->new = NULL;
- } else {
- ovsdb_idl_row_clear_new(row);
- }
+ ovsdb_idl_row_clear_new(row);
+ row->new = NULL;
}
-struct ovsdb_idl_row *
+const struct ovsdb_idl_row *
ovsdb_idl_txn_insert(struct ovsdb_idl_txn *txn,
const struct ovsdb_idl_table_class *class)
{
row->table = ovsdb_idl_table_from_class(txn->idl, class);
row->new = xmalloc(class->n_columns * sizeof *row->new);
row->written = bitmap_allocate(class->n_columns);
+ hmap_insert(&row->table->rows, &row->hmap_node, uuid_hash(&row->uuid));
hmap_insert(&txn->txn_rows, &row->txn_node, uuid_hash(&row->uuid));
return row;
}
return NULL;
}
+static bool
+check_json_type(const struct json *json, enum json_type type, const char *name)
+{
+ if (!json) {
+ VLOG_WARN_RL(&syntax_rl, "%s is missing", name);
+ return false;
+ } else if (json->type != type) {
+ VLOG_WARN_RL(&syntax_rl, "%s is %s instead of %s",
+ name, json_type_to_string(json->type),
+ json_type_to_string(type));
+ return false;
+ } else {
+ return true;
+ }
+}
+
+static bool
+ovsdb_idl_txn_process_inc_reply(struct ovsdb_idl_txn *txn,
+ const struct json_array *results)
+{
+ struct json *count, *rows, *row, *column;
+ struct shash *mutate, *select;
+
+ if (txn->inc_index + 2 > results->n) {
+ VLOG_WARN_RL(&syntax_rl, "reply does not contain enough operations "
+ "for increment (has %u, needs %u)",
+ results->n, txn->inc_index + 2);
+ return false;
+ }
+
+ /* We know that this is a JSON objects because the loop in
+ * ovsdb_idl_txn_process_reply() checked. */
+ mutate = json_object(results->elems[txn->inc_index]);
+ count = shash_find_data(mutate, "count");
+ if (!check_json_type(count, JSON_INTEGER, "\"mutate\" reply \"count\"")) {
+ return false;
+ }
+ if (count->u.integer != 1) {
+ VLOG_WARN_RL(&syntax_rl,
+ "\"mutate\" reply \"count\" is %"PRId64" instead of 1",
+ count->u.integer);
+ return false;
+ }
+
+ select = json_object(results->elems[txn->inc_index + 1]);
+ rows = shash_find_data(select, "rows");
+ if (!check_json_type(rows, JSON_ARRAY, "\"select\" reply \"rows\"")) {
+ return false;
+ }
+ if (rows->u.array.n != 1) {
+ VLOG_WARN_RL(&syntax_rl, "\"select\" reply \"rows\" has %u elements "
+ "instead of 1",
+ rows->u.array.n);
+ return false;
+ }
+ row = rows->u.array.elems[0];
+ if (!check_json_type(row, JSON_OBJECT, "\"select\" reply row")) {
+ return false;
+ }
+ column = shash_find_data(json_object(row), txn->inc_column);
+ if (!check_json_type(column, JSON_INTEGER,
+ "\"select\" reply inc column")) {
+ return false;
+ }
+ txn->inc_new_value = column->u.integer;
+ return true;
+}
+
+
static bool
ovsdb_idl_txn_process_reply(struct ovsdb_idl *idl,
const struct jsonrpc_msg *msg)
}
}
+ if (txn->inc_table
+ && !soft_errors
+ && !hard_errors
+ && !ovsdb_idl_txn_process_inc_reply(txn,
+ json_array(msg->result))) {
+ hard_errors++;
+ }
+
status = (hard_errors ? TXN_ERROR
: soft_errors ? TXN_TRY_AGAIN
: TXN_SUCCESS);