X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fjsonrpc-server.c;h=1149efd64beb7e0cef11b718b55f33d92060c9b2;hb=e879d33e8398219d5c9af8fd565c97303f126809;hp=1848bb989363994f5dc1786acf473212ab985703;hpb=6e492d81450217a5c90cbb4ad31d81b1e611989b;p=sliver-openvswitch.git diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index 1848bb989..1149efd64 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks +/* Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ #include "reconnect.h" #include "row.h" #include "server.h" +#include "simap.h" #include "stream.h" #include "table.h" #include "timeval.h" @@ -51,6 +52,8 @@ static struct ovsdb_jsonrpc_session *ovsdb_jsonrpc_session_create( struct ovsdb_jsonrpc_remote *, struct jsonrpc_session *); static void ovsdb_jsonrpc_session_run_all(struct ovsdb_jsonrpc_remote *); static void ovsdb_jsonrpc_session_wait_all(struct ovsdb_jsonrpc_remote *); +static void ovsdb_jsonrpc_session_get_memory_usage_all( + const struct ovsdb_jsonrpc_remote *, struct simap *usage); static void ovsdb_jsonrpc_session_close_all(struct ovsdb_jsonrpc_remote *); static void ovsdb_jsonrpc_session_reconnect_all(struct ovsdb_jsonrpc_remote *); static void ovsdb_jsonrpc_session_set_all_options( @@ -63,6 +66,7 @@ static void ovsdb_jsonrpc_session_unlock__(struct ovsdb_lock_waiter *); /* Triggers. */ static void ovsdb_jsonrpc_trigger_create(struct ovsdb_jsonrpc_session *, + struct ovsdb *, struct json *id, struct json *params); static struct ovsdb_jsonrpc_trigger *ovsdb_jsonrpc_trigger_find( struct ovsdb_jsonrpc_session *, const struct json *id, size_t hash); @@ -73,7 +77,7 @@ static void ovsdb_jsonrpc_trigger_complete_done( /* Monitors. */ static struct json *ovsdb_jsonrpc_monitor_create( - struct ovsdb_jsonrpc_session *, struct json *params); + struct ovsdb_jsonrpc_session *, struct ovsdb *, struct json *params); static struct jsonrpc_msg *ovsdb_jsonrpc_monitor_cancel( struct ovsdb_jsonrpc_session *, struct json_array *params, @@ -95,6 +99,7 @@ struct ovsdb_jsonrpc_remote { struct ovsdb_jsonrpc_server *server; struct pstream *listener; /* Listener, if passive. */ struct list sessions; /* List of "struct ovsdb_jsonrpc_session"s. */ + uint8_t dscp; }; static struct ovsdb_jsonrpc_remote *ovsdb_jsonrpc_server_add_remote( @@ -103,16 +108,29 @@ static struct ovsdb_jsonrpc_remote *ovsdb_jsonrpc_server_add_remote( ); static void ovsdb_jsonrpc_server_del_remote(struct shash_node *); +/* Creates and returns a new server to provide JSON-RPC access to an OVSDB. + * + * The caller must call ovsdb_jsonrpc_server_add_db() for each database to + * which 'server' should provide access. */ struct ovsdb_jsonrpc_server * -ovsdb_jsonrpc_server_create(struct ovsdb *db) +ovsdb_jsonrpc_server_create(void) { struct ovsdb_jsonrpc_server *server = xzalloc(sizeof *server); - ovsdb_server_init(&server->up, db); + ovsdb_server_init(&server->up); server->max_sessions = 64; shash_init(&server->remotes); return server; } +/* Adds 'db' to the set of databases served out by 'svr'. Returns true if + * successful, false if 'db''s name is the same as some database already in + * 'server'. */ +bool +ovsdb_jsonrpc_server_add_db(struct ovsdb_jsonrpc_server *svr, struct ovsdb *db) +{ + return ovsdb_server_add_db(&svr->up, db); +} + void ovsdb_jsonrpc_server_destroy(struct ovsdb_jsonrpc_server *svr) { @@ -127,11 +145,13 @@ ovsdb_jsonrpc_server_destroy(struct ovsdb_jsonrpc_server *svr) } struct ovsdb_jsonrpc_options * -ovsdb_jsonrpc_default_options(void) +ovsdb_jsonrpc_default_options(const char *target) { struct ovsdb_jsonrpc_options *options = xzalloc(sizeof *options); - options->probe_interval = RECONNECT_DEFAULT_PROBE_INTERVAL; options->max_backoff = RECONNECT_DEFAULT_MAX_BACKOFF; + options->probe_interval = (stream_or_pstream_needs_probes(target) + ? RECONNECT_DEFAULT_PROBE_INTERVAL + : 0); return options; } @@ -187,6 +207,7 @@ ovsdb_jsonrpc_server_add_remote(struct ovsdb_jsonrpc_server *svr, remote->server = svr; remote->listener = listener; list_init(&remote->sessions); + remote->dscp = options->dscp; shash_add(&svr->remotes, name, remote); if (!listener) { @@ -263,7 +284,8 @@ ovsdb_jsonrpc_server_run(struct ovsdb_jsonrpc_server *svr) error = pstream_accept(remote->listener, &stream); if (!error) { struct jsonrpc_session *js; - js = jsonrpc_session_open_unreliably(jsonrpc_open(stream)); + js = jsonrpc_session_open_unreliably(jsonrpc_open(stream), + remote->dscp); ovsdb_jsonrpc_session_create(remote, js); } else if (error != EAGAIN) { VLOG_WARN_RL(&rl, "%s: accept failed: %s", @@ -291,6 +313,22 @@ ovsdb_jsonrpc_server_wait(struct ovsdb_jsonrpc_server *svr) ovsdb_jsonrpc_session_wait_all(remote); } } + +/* Adds some memory usage statistics for 'svr' into 'usage', for use with + * memory_report(). */ +void +ovsdb_jsonrpc_server_get_memory_usage(const struct ovsdb_jsonrpc_server *svr, + struct simap *usage) +{ + struct shash_node *node; + + simap_increase(usage, "sessions", svr->n_sessions); + SHASH_FOR_EACH (node, &svr->remotes) { + struct ovsdb_jsonrpc_remote *remote = node->data; + + ovsdb_jsonrpc_session_get_memory_usage_all(remote, usage); + } +} /* JSON-RPC database server session. */ @@ -313,6 +351,8 @@ struct ovsdb_jsonrpc_session { static void ovsdb_jsonrpc_session_close(struct ovsdb_jsonrpc_session *); static int ovsdb_jsonrpc_session_run(struct ovsdb_jsonrpc_session *); static void ovsdb_jsonrpc_session_wait(struct ovsdb_jsonrpc_session *); +static void ovsdb_jsonrpc_session_get_memory_usage( + const struct ovsdb_jsonrpc_session *, struct simap *usage); static void ovsdb_jsonrpc_session_set_options( struct ovsdb_jsonrpc_session *, const struct ovsdb_jsonrpc_options *); static void ovsdb_jsonrpc_session_got_request(struct ovsdb_jsonrpc_session *, @@ -327,7 +367,7 @@ ovsdb_jsonrpc_session_create(struct ovsdb_jsonrpc_remote *remote, struct ovsdb_jsonrpc_session *s; s = xzalloc(sizeof *s); - ovsdb_session_init(&s->up, remote->server->up.db); + ovsdb_session_init(&s->up, &remote->server->up); s->remote = remote; list_push_back(&remote->sessions, &s->node); hmap_init(&s->triggers); @@ -426,6 +466,27 @@ ovsdb_jsonrpc_session_wait_all(struct ovsdb_jsonrpc_remote *remote) } } +static void +ovsdb_jsonrpc_session_get_memory_usage(const struct ovsdb_jsonrpc_session *s, + struct simap *usage) +{ + simap_increase(usage, "triggers", hmap_count(&s->triggers)); + simap_increase(usage, "monitors", hmap_count(&s->monitors)); + simap_increase(usage, "backlog", jsonrpc_session_get_backlog(s->js)); +} + +static void +ovsdb_jsonrpc_session_get_memory_usage_all( + const struct ovsdb_jsonrpc_remote *remote, + struct simap *usage) +{ + struct ovsdb_jsonrpc_session *s; + + LIST_FOR_EACH (s, node, &remote->sessions) { + ovsdb_jsonrpc_session_get_memory_usage(s, usage); + } +} + static void ovsdb_jsonrpc_session_close_all(struct ovsdb_jsonrpc_remote *remote) { @@ -460,6 +521,22 @@ ovsdb_jsonrpc_session_set_all_options( { struct ovsdb_jsonrpc_session *s; + if (remote->listener) { + int error; + + error = pstream_set_dscp(remote->listener, options->dscp); + if (error) { + VLOG_ERR("%s: set_dscp failed %s", + pstream_get_name(remote->listener), strerror(error)); + } else { + remote->dscp = options->dscp; + } + /* + * TODO:XXX race window between setting dscp to listening socket + * and accepting socket. Accepted socket may have old dscp value. + * Ignore this race window for now. + */ + } LIST_FOR_EACH (s, node, &remote->sessions) { ovsdb_jsonrpc_session_set_options(s, options); } @@ -514,21 +591,22 @@ ovsdb_jsonrpc_session_get_status(const struct ovsdb_jsonrpc_remote *remote, return true; } -static const char * -get_db_name(const struct ovsdb_jsonrpc_session *s) -{ - return s->remote->server->up.db->schema->name; -} - -static struct jsonrpc_msg * -ovsdb_jsonrpc_check_db_name(const struct ovsdb_jsonrpc_session *s, - const struct jsonrpc_msg *request) +/* Examines 'request' to determine the database to which it relates, and then + * searches 's' to find that database: + * + * - If successful, returns the database and sets '*replyp' to NULL. + * + * - If no such database exists, returns NULL and sets '*replyp' to an + * appropriate JSON-RPC error reply, owned by the caller. */ +static struct ovsdb * +ovsdb_jsonrpc_lookup_db(const struct ovsdb_jsonrpc_session *s, + const struct jsonrpc_msg *request, + struct jsonrpc_msg **replyp) { struct json_array *params; - const char *want_db_name; - const char *have_db_name; struct ovsdb_error *error; - struct jsonrpc_msg *reply; + const char *db_name; + struct ovsdb *db; params = json_array(request->params); if (!params->n || params->elems[0]->type != JSON_STRING) { @@ -538,22 +616,23 @@ ovsdb_jsonrpc_check_db_name(const struct ovsdb_jsonrpc_session *s, goto error; } - want_db_name = params->elems[0]->u.string; - have_db_name = get_db_name(s); - if (strcmp(want_db_name, have_db_name)) { + db_name = params->elems[0]->u.string; + db = shash_find_data(&s->up.server->dbs, db_name); + if (!db) { error = ovsdb_syntax_error( request->params, "unknown database", "%s request specifies unknown database %s", - request->method, want_db_name); + request->method, db_name); goto error; } - return NULL; + *replyp = NULL; + return db; error: - reply = jsonrpc_create_reply(ovsdb_error_to_json(error), request->id); + *replyp = jsonrpc_create_reply(ovsdb_error_to_json(error), request->id); ovsdb_error_destroy(error); - return reply; + return NULL; } static struct ovsdb_error * @@ -695,10 +774,10 @@ error: } static struct jsonrpc_msg * -execute_transaction(struct ovsdb_jsonrpc_session *s, +execute_transaction(struct ovsdb_jsonrpc_session *s, struct ovsdb *db, struct jsonrpc_msg *request) { - ovsdb_jsonrpc_trigger_create(s, request->id, request->params); + ovsdb_jsonrpc_trigger_create(s, db, request->id, request->params); request->id = NULL; request->params = NULL; jsonrpc_msg_destroy(request); @@ -712,30 +791,39 @@ ovsdb_jsonrpc_session_got_request(struct ovsdb_jsonrpc_session *s, struct jsonrpc_msg *reply; if (!strcmp(request->method, "transact")) { - reply = ovsdb_jsonrpc_check_db_name(s, request); + struct ovsdb *db = ovsdb_jsonrpc_lookup_db(s, request, &reply); if (!reply) { - reply = execute_transaction(s, request); + reply = execute_transaction(s, db, request); } } else if (!strcmp(request->method, "monitor")) { - reply = ovsdb_jsonrpc_check_db_name(s, request); + struct ovsdb *db = ovsdb_jsonrpc_lookup_db(s, request, &reply); if (!reply) { reply = jsonrpc_create_reply( - ovsdb_jsonrpc_monitor_create(s, request->params), request->id); + ovsdb_jsonrpc_monitor_create(s, db, request->params), + request->id); } } else if (!strcmp(request->method, "monitor_cancel")) { reply = ovsdb_jsonrpc_monitor_cancel(s, json_array(request->params), request->id); } else if (!strcmp(request->method, "get_schema")) { - reply = ovsdb_jsonrpc_check_db_name(s, request); + struct ovsdb *db = ovsdb_jsonrpc_lookup_db(s, request, &reply); if (!reply) { - reply = jsonrpc_create_reply( - ovsdb_schema_to_json(s->remote->server->up.db->schema), - request->id); + reply = jsonrpc_create_reply(ovsdb_schema_to_json(db->schema), + request->id); } } else if (!strcmp(request->method, "list_dbs")) { - reply = jsonrpc_create_reply( - json_array_create_1(json_string_create(get_db_name(s))), - request->id); + size_t n_dbs = shash_count(&s->up.server->dbs); + struct shash_node *node; + struct json **dbs; + size_t i; + + dbs = xmalloc(n_dbs * sizeof *dbs); + i = 0; + SHASH_FOR_EACH (node, &s->up.server->dbs) { + dbs[i++] = json_string_create(node->name); + } + reply = jsonrpc_create_reply(json_array_create(dbs, n_dbs), + request->id); } else if (!strcmp(request->method, "lock")) { reply = ovsdb_jsonrpc_session_lock(s, request, OVSDB_LOCK_WAIT); } else if (!strcmp(request->method, "steal")) { @@ -792,7 +880,7 @@ struct ovsdb_jsonrpc_trigger { }; static void -ovsdb_jsonrpc_trigger_create(struct ovsdb_jsonrpc_session *s, +ovsdb_jsonrpc_trigger_create(struct ovsdb_jsonrpc_session *s, struct ovsdb *db, struct json *id, struct json *params) { struct ovsdb_jsonrpc_trigger *t; @@ -814,7 +902,7 @@ ovsdb_jsonrpc_trigger_create(struct ovsdb_jsonrpc_session *s, /* Insert into trigger table. */ t = xmalloc(sizeof *t); - ovsdb_trigger_init(&s->up, &t->trigger, params, time_msec()); + ovsdb_trigger_init(&s->up, db, &t->trigger, params, time_msec()); t->id = id; hmap_insert(&s->triggers, &t->hmap_node, hash); @@ -918,6 +1006,7 @@ struct ovsdb_jsonrpc_monitor_table { struct ovsdb_jsonrpc_monitor { struct ovsdb_replica replica; struct ovsdb_jsonrpc_session *session; + struct ovsdb *db; struct hmap_node node; /* In ovsdb_jsonrpc_session's "monitors". */ struct json *monitor_id; @@ -1069,7 +1158,7 @@ ovsdb_jsonrpc_parse_monitor_request(struct ovsdb_jsonrpc_monitor_table *mt, } static struct json * -ovsdb_jsonrpc_monitor_create(struct ovsdb_jsonrpc_session *s, +ovsdb_jsonrpc_monitor_create(struct ovsdb_jsonrpc_session *s, struct ovsdb *db, struct json *params) { struct ovsdb_jsonrpc_monitor *m = NULL; @@ -1097,8 +1186,9 @@ ovsdb_jsonrpc_monitor_create(struct ovsdb_jsonrpc_session *s, m = xzalloc(sizeof *m); ovsdb_replica_init(&m->replica, &ovsdb_jsonrpc_replica_class); - ovsdb_add_replica(s->remote->server->up.db, &m->replica); + ovsdb_add_replica(db, &m->replica); m->session = s; + m->db = db; hmap_insert(&s->monitors, &m->node, json_hash(monitor_id, 0)); m->monitor_id = json_clone(monitor_id); shash_init(&m->tables); @@ -1110,7 +1200,7 @@ ovsdb_jsonrpc_monitor_create(struct ovsdb_jsonrpc_session *s, const struct json *mr_value; size_t i; - table = ovsdb_get_table(s->remote->server->up.db, node->name); + table = ovsdb_get_table(m->db, node->name); if (!table) { error = ovsdb_syntax_error(NULL, NULL, "no table named %s", node->name); @@ -1159,7 +1249,7 @@ ovsdb_jsonrpc_monitor_create(struct ovsdb_jsonrpc_session *s, error: if (m) { - ovsdb_remove_replica(s->remote->server->up.db, &m->replica); + ovsdb_remove_replica(m->db, &m->replica); } json = ovsdb_error_to_json(error); @@ -1183,7 +1273,7 @@ ovsdb_jsonrpc_monitor_cancel(struct ovsdb_jsonrpc_session *s, return jsonrpc_create_error(json_string_create("unknown monitor"), request_id); } else { - ovsdb_remove_replica(s->remote->server->up.db, &m->replica); + ovsdb_remove_replica(m->db, &m->replica); return jsonrpc_create_reply(json_object_create(), request_id); } } @@ -1195,7 +1285,7 @@ ovsdb_jsonrpc_monitor_remove_all(struct ovsdb_jsonrpc_session *s) struct ovsdb_jsonrpc_monitor *m, *next; HMAP_FOR_EACH_SAFE (m, next, node, &s->monitors) { - ovsdb_remove_replica(s->remote->server->up.db, &m->replica); + ovsdb_remove_replica(m->db, &m->replica); } }