-/* Copyright (c) 2009, 2010 Nicira Networks
+/* Copyright (c) 2009, 2010, 2011 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 "bitmap.h"
#include "column.h"
+#include "dynamic-string.h"
#include "json.h"
#include "jsonrpc.h"
#include "ovsdb-error.h"
struct ovsdb_jsonrpc_session;
/* Message rate-limiting. */
-struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
+static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
/* Sessions. */
static struct ovsdb_jsonrpc_session *ovsdb_jsonrpc_session_create(
static void ovsdb_jsonrpc_session_reconnect_all(struct ovsdb_jsonrpc_remote *);
static void ovsdb_jsonrpc_session_set_all_options(
struct ovsdb_jsonrpc_remote *, const struct ovsdb_jsonrpc_options *);
+static bool ovsdb_jsonrpc_session_get_status(
+ const struct ovsdb_jsonrpc_remote *,
+ struct ovsdb_jsonrpc_remote_status *);
/* Triggers. */
static void ovsdb_jsonrpc_trigger_create(struct ovsdb_jsonrpc_session *,
SHASH_FOR_EACH_SAFE (node, next, &svr->remotes) {
if (!shash_find(new_remotes, node->name)) {
+ VLOG_INFO("%s: remote deconfigured", node->name);
ovsdb_jsonrpc_server_del_remote(node);
}
}
free(remote);
}
+/* Stores status information for the remote named 'target', which should have
+ * been configured on 'svr' with a call to ovsdb_jsonrpc_server_set_remotes(),
+ * into '*status'. On success returns true, on failure (if 'svr' doesn't have
+ * a remote named 'target' or if that remote is an inbound remote that has no
+ * active connections) returns false. On failure, 'status' will be zeroed.
+ */
+bool
+ovsdb_jsonrpc_server_get_remote_status(
+ const struct ovsdb_jsonrpc_server *svr, const char *target,
+ struct ovsdb_jsonrpc_remote_status *status)
+{
+ const struct ovsdb_jsonrpc_remote *remote;
+
+ memset(status, 0, sizeof *status);
+
+ remote = shash_find_data(&svr->remotes, target);
+ return remote && ovsdb_jsonrpc_session_get_status(remote, status);
+}
+
/* Forces all of the JSON-RPC sessions managed by 'svr' to disconnect and
* reconnect. */
void
}
}
+static bool
+ovsdb_jsonrpc_session_get_status(const struct ovsdb_jsonrpc_remote *remote,
+ struct ovsdb_jsonrpc_remote_status *status)
+{
+ const struct ovsdb_jsonrpc_session *s;
+ const struct jsonrpc_session *js;
+ struct reconnect_stats rstats;
+
+ if (list_is_empty(&remote->sessions)) {
+ return false;
+ }
+ s = CONTAINER_OF(remote->sessions.next, struct ovsdb_jsonrpc_session, node);
+ js = s->js;
+
+ status->is_connected = jsonrpc_session_is_connected(js);
+ status->last_error = jsonrpc_session_get_status(js);
+
+ jsonrpc_session_get_reconnect_stats(js, &rstats);
+ status->state = rstats.state;
+ status->sec_since_connect = rstats.msec_since_connect == UINT_MAX
+ ? UINT_MAX : rstats.msec_since_connect / 1000;
+ status->sec_since_disconnect = rstats.msec_since_disconnect == UINT_MAX
+ ? UINT_MAX : rstats.msec_since_disconnect / 1000;
+
+ status->n_connections = list_size(&remote->sessions);
+
+ return true;
+}
+
static const char *
get_db_name(const struct ovsdb_jsonrpc_session *s)
{
struct json *table_json; /* JSON for table's transaction. */
};
+static bool
+any_reportable_change(const struct ovsdb_jsonrpc_monitor_table *mt,
+ const unsigned long int *changed)
+{
+ size_t i;
+
+ for (i = 0; i < mt->n_columns; i++) {
+ const struct ovsdb_jsonrpc_monitor_column *c = &mt->columns[i];
+ unsigned int idx = c->column->index;
+
+ if (c->select & OJMS_MODIFY && bitmap_is_set(changed, idx)) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
static bool
ovsdb_jsonrpc_monitor_change_cb(const struct ovsdb_row *old,
const struct ovsdb_row *new,
struct json *old_json, *new_json;
struct json *row_json;
char uuid[UUID_LEN + 1];
- int n_changed;
size_t i;
if (!aux->mt || table != aux->mt->table) {
return true;
}
+ if (type == OJMS_MODIFY && !any_reportable_change(aux->mt, changed)) {
+ /* Nothing of interest changed. */
+ return true;
+ }
+
old_json = new_json = NULL;
- n_changed = 0;
+ if (type & (OJMS_DELETE | OJMS_MODIFY)) {
+ old_json = json_object_create();
+ }
+ if (type & (OJMS_INITIAL | OJMS_INSERT | OJMS_MODIFY)) {
+ new_json = json_object_create();
+ }
for (i = 0; i < aux->mt->n_columns; i++) {
const struct ovsdb_jsonrpc_monitor_column *c = &aux->mt->columns[i];
const struct ovsdb_column *column = c->column;
unsigned int idx = c->column->index;
- bool column_changed = false;
if (!(type & c->select)) {
/* We don't care about this type of change for this particular
continue;
}
- if (type == OJMS_MODIFY) {
- column_changed = bitmap_is_set(changed, idx);
- n_changed += column_changed;
- }
- if (column_changed || type == OJMS_DELETE) {
- if (!old_json) {
- old_json = json_object_create();
- }
+ if ((type == OJMS_MODIFY && bitmap_is_set(changed, idx))
+ || type == OJMS_DELETE) {
json_object_put(old_json, column->name,
ovsdb_datum_to_json(&old->fields[idx],
&column->type));
}
if (type & (OJMS_INITIAL | OJMS_INSERT | OJMS_MODIFY)) {
- if (!new_json) {
- new_json = json_object_create();
- }
json_object_put(new_json, column->name,
ovsdb_datum_to_json(&new->fields[idx],
&column->type));
}
}
- if ((type == OJMS_MODIFY && !n_changed) || (!old_json && !new_json)) {
- /* No reportable changes. */
- json_destroy(old_json);
- json_destroy(new_json);
- return true;
- }
/* Create JSON object for transaction overall. */
if (!aux->json) {
git://git.onelab.eu / sliver-openvswitch.git / blobdiff