X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb-server.c;h=7f53e177fc20de85380cee9d6888945fb0cc2080;hb=0442efd9b1a88d923b56eab6b72b6be8231a49f7;hp=14f0fbfb757c9d71944ac02941e4e550463f13fb;hpb=bf8f2167fd3107f5513d487a69a6568cf51afd68;p=sliver-openvswitch.git diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index 14f0fbfb7..7f53e177f 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011 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. @@ -15,8 +15,7 @@ #include -#include "ovsdb.h" - +#include #include #include #include @@ -25,18 +24,23 @@ #include "column.h" #include "command-line.h" #include "daemon.h" +#include "dirs.h" #include "file.h" +#include "hash.h" #include "json.h" #include "jsonrpc.h" #include "jsonrpc-server.h" #include "leak-checker.h" #include "list.h" +#include "memory.h" +#include "ovsdb.h" #include "ovsdb-data.h" #include "ovsdb-types.h" #include "ovsdb-error.h" #include "poll-loop.h" #include "process.h" #include "row.h" +#include "simap.h" #include "stream-ssl.h" #include "stream.h" #include "stress.h" @@ -105,6 +109,7 @@ main(int argc, char *argv[]) if (error) { ovs_fatal(0, "%s", ovsdb_error_to_string(error)); } + free(file_name); jsonrpc = ovsdb_jsonrpc_server_create(db); reconfigure_from_db(jsonrpc, db, &remotes); @@ -132,14 +137,25 @@ main(int argc, char *argv[]) daemonize_complete(); - unixctl_command_register("exit", ovsdb_server_exit, &exiting); - unixctl_command_register("ovsdb-server/compact", ovsdb_server_compact, - file); - unixctl_command_register("ovsdb-server/reconnect", ovsdb_server_reconnect, - jsonrpc); + unixctl_command_register("exit", "", 0, 0, ovsdb_server_exit, &exiting); + unixctl_command_register("ovsdb-server/compact", "", 0, 0, + ovsdb_server_compact, file); + unixctl_command_register("ovsdb-server/reconnect", "", 0, 0, + ovsdb_server_reconnect, jsonrpc); exiting = false; while (!exiting) { + memory_run(); + if (memory_should_report()) { + struct simap usage; + + simap_init(&usage); + ovsdb_jsonrpc_server_get_memory_usage(jsonrpc, &usage); + ovsdb_get_memory_usage(db, &usage); + memory_report(&usage); + simap_destroy(&usage); + } + reconfigure_from_db(jsonrpc, db, &remotes); ovsdb_jsonrpc_server_run(jsonrpc); unixctl_server_run(unixctl); @@ -154,6 +170,7 @@ main(int argc, char *argv[]) update_remote_status(jsonrpc, &remotes, db); } + memory_wait(); ovsdb_jsonrpc_server_wait(jsonrpc); unixctl_server_wait(unixctl); ovsdb_trigger_wait(db, time_msec()); @@ -273,7 +290,7 @@ add_remote(struct shash *remotes, const char *target) options = shash_find_data(remotes, target); if (!options) { - options = ovsdb_jsonrpc_default_options(); + options = ovsdb_jsonrpc_default_options(target); shash_add(remotes, target, options); } @@ -316,13 +333,42 @@ get_datum(struct ovsdb_row *row, const char *column_name, return &row->fields[column->index]; } +/* Read string-string key-values from a map. Returns the value associated with + * 'key', if found, or NULL */ +static const char * +read_map_string_column(const struct ovsdb_row *row, const char *column_name, + const char *key) +{ + const struct ovsdb_datum *datum; + union ovsdb_atom *atom_key = NULL, *atom_value = NULL; + size_t i; + + datum = get_datum((struct ovsdb_row *) row, column_name, OVSDB_TYPE_STRING, + OVSDB_TYPE_STRING, UINT_MAX); + + if (!datum) { + return NULL; + } + + for (i = 0; i < datum->n; i++) { + atom_key = &datum->keys[i]; + if (!strcmp(atom_key->string, key)){ + atom_value = &datum->values[i]; + break; + } + } + + return atom_value ? atom_value->string : NULL; +} + static const union ovsdb_atom * read_column(const struct ovsdb_row *row, const char *column_name, enum ovsdb_atomic_type type) { const struct ovsdb_datum *datum; - datum = get_datum((struct ovsdb_row *) row, column_name, type, OVSDB_TYPE_VOID, 1); + datum = get_datum((struct ovsdb_row *) row, column_name, type, OVSDB_TYPE_VOID, + 1); return datum && datum->n ? datum->keys : NULL; } @@ -344,7 +390,7 @@ read_string_column(const struct ovsdb_row *row, const char *column_name, const union ovsdb_atom *atom; atom = read_column(row, column_name, OVSDB_TYPE_STRING); - *stringp = atom ? atom->string : 0; + *stringp = atom ? atom->string : NULL; return atom != NULL; } @@ -400,7 +446,7 @@ add_manager_options(struct shash *remotes, const struct ovsdb_row *row) static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); struct ovsdb_jsonrpc_options *options; long long int max_backoff, probe_interval; - const char *target; + const char *target, *dscp_string; if (!read_string_column(row, "target", &target) || !target) { VLOG_INFO_RL(&rl, "Table `%s' has missing or invalid `target' column", @@ -415,6 +461,15 @@ add_manager_options(struct shash *remotes, const struct ovsdb_row *row) if (read_integer_column(row, "inactivity_probe", &probe_interval)) { options->probe_interval = probe_interval; } + + options->dscp = DSCP_DEFAULT; + dscp_string = read_map_string_column(row, "other_config", "dscp"); + if (dscp_string) { + int dscp = atoi(dscp_string); + if (dscp >= 0 && dscp <= 63) { + options->dscp = dscp; + } + } } static void @@ -461,12 +516,12 @@ query_db_remotes(const char *name, const struct ovsdb *db, static void update_remote_row(const struct ovsdb_row *row, struct ovsdb_txn *txn, - const struct shash *statuses) + const struct ovsdb_jsonrpc_server *jsonrpc) { + struct ovsdb_jsonrpc_remote_status status; struct ovsdb_row *rw_row; const char *target; - const struct ovsdb_jsonrpc_remote_status *status; - char *keys[4], *values[4]; + char *keys[8], *values[8]; size_t n = 0; /* Get the "target" (protocol/host/port) spec. */ @@ -474,43 +529,54 @@ update_remote_row(const struct ovsdb_row *row, struct ovsdb_txn *txn, /* Bad remote spec or incorrect schema. */ return; } - - /* Prepare to modify this row. */ rw_row = ovsdb_txn_row_modify(txn, row); - - /* Find status information for this target. */ - status = shash_find_data(statuses, target); - if (!status) { - /* Should never happen, but just in case... */ - return; - } + ovsdb_jsonrpc_server_get_remote_status(jsonrpc, target, &status); /* Update status information columns. */ + write_bool_column(rw_row, "is_connected", status.is_connected); - write_bool_column(rw_row, "is_connected", - status->is_connected); - - keys[n] = xstrdup("state"); - values[n++] = xstrdup(status->state); - if (status->sec_since_connect != UINT_MAX) { + if (status.state) { + keys[n] = xstrdup("state"); + values[n++] = xstrdup(status.state); + } + if (status.sec_since_connect != UINT_MAX) { keys[n] = xstrdup("sec_since_connect"); - values[n++] = xasprintf("%u", status->sec_since_connect); + values[n++] = xasprintf("%u", status.sec_since_connect); } - if (status->sec_since_disconnect != UINT_MAX) { + if (status.sec_since_disconnect != UINT_MAX) { keys[n] = xstrdup("sec_since_disconnect"); - values[n++] = xasprintf("%u", status->sec_since_disconnect); + values[n++] = xasprintf("%u", status.sec_since_disconnect); } - if (status->last_error) { + if (status.last_error) { keys[n] = xstrdup("last_error"); values[n++] = - xstrdup(ovs_retval_to_string(status->last_error)); + xstrdup(ovs_retval_to_string(status.last_error)); + } + if (status.locks_held && status.locks_held[0]) { + keys[n] = xstrdup("locks_held"); + values[n++] = xstrdup(status.locks_held); + } + if (status.locks_waiting && status.locks_waiting[0]) { + keys[n] = xstrdup("locks_waiting"); + values[n++] = xstrdup(status.locks_waiting); + } + if (status.locks_lost && status.locks_lost[0]) { + keys[n] = xstrdup("locks_lost"); + values[n++] = xstrdup(status.locks_lost); + } + if (status.n_connections > 1) { + keys[n] = xstrdup("n_connections"); + values[n++] = xasprintf("%d", status.n_connections); } write_string_string_column(rw_row, "status", keys, values, n); + + ovsdb_jsonrpc_server_free_remote_status(&status); } static void update_remote_rows(const struct ovsdb *db, struct ovsdb_txn *txn, - const char *remote_name, const struct shash *statuses) + const char *remote_name, + const struct ovsdb_jsonrpc_server *jsonrpc) { const struct ovsdb_table *table, *ref_table; const struct ovsdb_column *column; @@ -540,7 +606,7 @@ update_remote_rows(const struct ovsdb *db, struct ovsdb_txn *txn, ref_row = ovsdb_table_get_row(ref_table, &datum->keys[i].uuid); if (ref_row) { - update_remote_row(ref_row, txn, statuses); + update_remote_row(ref_row, txn, jsonrpc); } } } @@ -551,20 +617,16 @@ update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc, const struct sset *remotes, struct ovsdb *db) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); - struct shash statuses; struct ovsdb_txn *txn; const bool durable_txn = false; struct ovsdb_error *error; const char *remote; - /* Get status of current connections. */ - ovsdb_jsonrpc_server_get_remote_status(jsonrpc, &statuses); - txn = ovsdb_txn_create(db); /* Iterate over --remote arguments given on command line. */ SSET_FOR_EACH (remote, remotes) { - update_remote_rows(db, txn, remote, &statuses); + update_remote_rows(db, txn, remote, jsonrpc); } error = ovsdb_txn_commit(txn, durable_txn); @@ -572,8 +634,6 @@ update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc, VLOG_ERR_RL(&rl, "Failed to update remote status: %s", ovsdb_error_to_string(error)); } - - shash_destroy_free_data(&statuses); } /* Reconfigures ovsdb-server based on information in the database. */ @@ -604,17 +664,18 @@ reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc, } static void -ovsdb_server_exit(struct unixctl_conn *conn, const char *args OVS_UNUSED, +ovsdb_server_exit(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *exiting_) { bool *exiting = exiting_; *exiting = true; - unixctl_command_reply(conn, 200, NULL); + unixctl_command_reply(conn, NULL); } static void -ovsdb_server_compact(struct unixctl_conn *conn, const char *args OVS_UNUSED, - void *file_) +ovsdb_server_compact(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *file_) { struct ovsdb_file *file = file_; struct ovsdb_error *error; @@ -622,11 +683,11 @@ ovsdb_server_compact(struct unixctl_conn *conn, const char *args OVS_UNUSED, VLOG_INFO("compacting database by user request"); error = ovsdb_file_compact(file); if (!error) { - unixctl_command_reply(conn, 200, NULL); + unixctl_command_reply(conn, NULL); } else { char *s = ovsdb_error_to_string(error); ovsdb_error_destroy(error); - unixctl_command_reply(conn, 503, s); + unixctl_command_reply_error(conn, s); free(s); } } @@ -634,13 +695,13 @@ ovsdb_server_compact(struct unixctl_conn *conn, const char *args OVS_UNUSED, /* "ovsdb-server/reconnect": makes ovsdb-server drop all of its JSON-RPC * connections and reconnect. */ static void -ovsdb_server_reconnect(struct unixctl_conn *conn, const char *args OVS_UNUSED, - void *jsonrpc_) +ovsdb_server_reconnect(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *jsonrpc_) { struct ovsdb_jsonrpc_server *jsonrpc = jsonrpc_; ovsdb_jsonrpc_server_reconnect(jsonrpc); - unixctl_command_reply(conn, 200, NULL); + unixctl_command_reply(conn, NULL); } static void @@ -659,19 +720,19 @@ parse_options(int argc, char *argv[], char **file_namep, DAEMON_OPTION_ENUMS }; static struct option long_options[] = { - {"remote", required_argument, 0, OPT_REMOTE}, - {"unixctl", required_argument, 0, OPT_UNIXCTL}, - {"run", required_argument, 0, OPT_RUN}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, + {"remote", required_argument, NULL, OPT_REMOTE}, + {"unixctl", required_argument, NULL, OPT_UNIXCTL}, + {"run", required_argument, NULL, OPT_RUN}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, DAEMON_LONG_OPTIONS, VLOG_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS, - {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, - {"private-key", required_argument, 0, 'p'}, - {"certificate", required_argument, 0, 'c'}, - {"ca-cert", required_argument, 0, 'C'}, - {0, 0, 0, 0}, + {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT}, + {"private-key", required_argument, NULL, 'p'}, + {"certificate", required_argument, NULL, 'c'}, + {"ca-cert", required_argument, NULL, 'C'}, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -701,7 +762,7 @@ parse_options(int argc, char *argv[], char **file_namep, usage(); case 'V': - OVS_PRINT_VERSION(0, 0); + ovs_print_version(0, 0); exit(EXIT_SUCCESS); VLOG_OPTION_HANDLERS @@ -738,14 +799,19 @@ parse_options(int argc, char *argv[], char **file_namep, argc -= optind; argv += optind; - if (argc > 1) { + switch (argc) { + case 0: + *file_namep = xasprintf("%s/openvswitch/conf.db", ovs_sysconfdir()); + break; + + case 1: + *file_namep = xstrdup(argv[0]); + break; + + default: ovs_fatal(0, "database file is only non-option argument; " "use --help for usage"); - } else if (argc < 1) { - ovs_fatal(0, "missing database file argument; use --help for usage"); } - - *file_namep = argv[0]; } static void