X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb-tool.c;h=2ae782ebad720b103f5e21d8272a3cf68050a140;hb=c5cf10598f8c9f4428291e9df3ecd72a05fb1ccf;hp=015ee12582894f619308d6b54cff1ed449634455;hpb=4e92542cefb73120de987cabc75b9a1a742999f0;p=sliver-openvswitch.git diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c index 015ee1258..2ae782eba 100644 --- a/ovsdb/ovsdb-tool.c +++ b/ovsdb/ovsdb-tool.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,9 @@ #include "column.h" #include "command-line.h" #include "compiler.h" +#include "dirs.h" #include "dynamic-string.h" +#include "fatal-signal.h" #include "file.h" #include "lockfile.h" #include "log.h" @@ -39,30 +41,31 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ovsdb_tool); - /* -m, --more: Verbosity level for "show-log" command output. */ static int show_log_verbosity; -static const struct command all_commands[]; +static const struct command *get_all_commands(void); static void usage(void) NO_RETURN; static void parse_options(int argc, char *argv[]); +static const char *default_db(void); +static const char *default_schema(void); + int main(int argc, char *argv[]) { set_program_name(argv[0]); parse_options(argc, argv); - signal(SIGPIPE, SIG_IGN); - run_command(argc - optind, argv + optind, all_commands); + fatal_ignore_sigpipe(); + run_command(argc - optind, argv + optind, get_all_commands()); return 0; } static void parse_options(int argc, char *argv[]) { - static struct option long_options[] = { + static const struct option long_options[] = { {"more", no_argument, NULL, 'm'}, {"verbose", optional_argument, NULL, 'v'}, {"help", no_argument, NULL, 'h'}, @@ -110,17 +113,19 @@ usage(void) { printf("%s: Open vSwitch database management utility\n" "usage: %s [OPTIONS] COMMAND [ARG...]\n" - " create DB SCHEMA create DB with the given SCHEMA\n" - " compact DB [DST] compact DB in-place (or to DST)\n" - " convert DB SCHEMA [DST] convert DB to SCHEMA (to DST)\n" - " db-version DB report version of schema used by DB\n" - " db-cksum DB report checksum of schema used by DB\n" - " schema-version SCHEMA report SCHEMA's schema version\n" - " schema-cksum SCHEMA report SCHEMA's checksum\n" - " query DB TRNS execute read-only transaction on DB\n" - " transact DB TRNS execute read/write transaction on DB\n" - " show-log DB prints information about DB's log entries\n", - program_name, program_name); + " create [DB [SCHEMA]] create DB with the given SCHEMA\n" + " compact [DB [DST]] compact DB in-place (or to DST)\n" + " convert [DB [SCHEMA [DST]]] convert DB to SCHEMA (to DST)\n" + " db-version [DB] report version of schema used by DB\n" + " db-cksum [DB] report checksum of schema used by DB\n" + " schema-version [SCHEMA] report SCHEMA's schema version\n" + " schema-cksum [SCHEMA] report SCHEMA's checksum\n" + " query [DB] TRNS execute read-only transaction on DB\n" + " transact [DB] TRNS execute read/write transaction on DB\n" + " [-m]... show-log [DB] print DB's log entries\n" + "The default DB is %s.\n" + "The default SCHEMA is %s.\n", + program_name, program_name, default_db(), default_schema()); vlog_usage(); printf("\nOther options:\n" " -m, --more increase show-log verbosity\n" @@ -128,6 +133,26 @@ usage(void) " -V, --version display version information\n"); exit(EXIT_SUCCESS); } + +static const char * +default_db(void) +{ + static char *db; + if (!db) { + db = xasprintf("%s/conf.db", ovs_dbdir()); + } + return db; +} + +static const char * +default_schema(void) +{ + static char *schema; + if (!schema) { + schema = xasprintf("%s/vswitch.ovsschema", ovs_pkgdatadir()); + } + return schema; +} static struct json * parse_json(const char *s) @@ -157,10 +182,10 @@ check_ovsdb_error(struct ovsdb_error *error) } static void -do_create(int argc OVS_UNUSED, char *argv[]) +do_create(int argc, char *argv[]) { - const char *db_file_name = argv[1]; - const char *schema_file_name = argv[2]; + const char *db_file_name = argc >= 2 ? argv[1] : default_db(); + const char *schema_file_name = argc >= 3 ? argv[2] : default_schema(); struct ovsdb_schema *schema; struct ovsdb_log *log; struct json *json; @@ -181,29 +206,36 @@ do_create(int argc OVS_UNUSED, char *argv[]) } static void -compact_or_convert(const char *src_name, const char *dst_name, +compact_or_convert(const char *src_name_, const char *dst_name_, const struct ovsdb_schema *new_schema, const char *comment) { + char *src_name, *dst_name; struct lockfile *src_lock; struct lockfile *dst_lock; - bool in_place = dst_name == NULL; + bool in_place = dst_name_ == NULL; struct ovsdb *db; int retval; + /* Dereference symlinks for source and destination names. In the in-place + * case this ensures that, if the source name is a symlink, we replace its + * target instead of replacing the symlink by a regular file. In the + * non-in-place, this has the same effect for the destination name. */ + src_name = follow_symlinks(src_name_); + dst_name = (in_place + ? xasprintf("%s.tmp", src_name) + : follow_symlinks(dst_name_)); + /* Lock the source, if we will be replacing it. */ if (in_place) { - retval = lockfile_lock(src_name, 0, &src_lock); + retval = lockfile_lock(src_name, &src_lock); if (retval) { ovs_fatal(retval, "%s: failed to lock lockfile", src_name); } } /* Get (temporary) destination and lock it. */ - if (in_place) { - dst_name = xasprintf("%s.tmp", src_name); - } - retval = lockfile_lock(dst_name, 0, &dst_lock); + retval = lockfile_lock(dst_name, &dst_lock); if (retval) { ovs_fatal(retval, "%s: failed to lock lockfile", dst_name); } @@ -226,32 +258,39 @@ compact_or_convert(const char *src_name, const char *dst_name, } lockfile_unlock(dst_lock); + + free(src_name); + free(dst_name); } static void -do_compact(int argc OVS_UNUSED, char *argv[]) +do_compact(int argc, char *argv[]) { - compact_or_convert(argv[1], argv[2], NULL, - "compacted by ovsdb-tool "VERSION BUILDNR); + const char *db = argc >= 2 ? argv[1] : default_db(); + const char *target = argc >= 3 ? argv[2] : NULL; + + compact_or_convert(db, target, NULL, "compacted by ovsdb-tool "VERSION); } static void -do_convert(int argc OVS_UNUSED, char *argv[]) +do_convert(int argc, char *argv[]) { - const char *schema_file_name = argv[2]; + const char *db = argc >= 2 ? argv[1] : default_db(); + const char *schema = argc >= 3 ? argv[2] : default_schema(); + const char *target = argc >= 4 ? argv[3] : NULL; struct ovsdb_schema *new_schema; - check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &new_schema)); - compact_or_convert(argv[1], argv[3], new_schema, - "converted by ovsdb-tool "VERSION BUILDNR); + check_ovsdb_error(ovsdb_schema_from_file(schema, &new_schema)); + compact_or_convert(db, target, new_schema, + "converted by ovsdb-tool "VERSION); ovsdb_schema_destroy(new_schema); } static void -do_needs_conversion(int argc OVS_UNUSED, char *argv[]) +do_needs_conversion(int argc, char *argv[]) { - const char *db_file_name = argv[1]; - const char *schema_file_name = argv[2]; + const char *db_file_name = argc >= 2 ? argv[1] : default_db(); + const char *schema_file_name = argc >= 3 ? argv[2] : default_schema(); struct ovsdb_schema *schema1, *schema2; check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema1)); @@ -262,9 +301,9 @@ do_needs_conversion(int argc OVS_UNUSED, char *argv[]) } static void -do_db_version(int argc OVS_UNUSED, char *argv[]) +do_db_version(int argc, char *argv[]) { - const char *db_file_name = argv[1]; + const char *db_file_name = argc >= 2 ? argv[1] : default_db(); struct ovsdb_schema *schema; check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema)); @@ -275,7 +314,7 @@ do_db_version(int argc OVS_UNUSED, char *argv[]) static void do_db_cksum(int argc OVS_UNUSED, char *argv[]) { - const char *db_file_name = argv[1]; + const char *db_file_name = argc >= 2 ? argv[1] : default_db(); struct ovsdb_schema *schema; check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema)); @@ -284,9 +323,9 @@ do_db_cksum(int argc OVS_UNUSED, char *argv[]) } static void -do_schema_version(int argc OVS_UNUSED, char *argv[]) +do_schema_version(int argc, char *argv[]) { - const char *schema_file_name = argv[1]; + const char *schema_file_name = argc >= 2 ? argv[1] : default_schema(); struct ovsdb_schema *schema; check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema)); @@ -295,9 +334,9 @@ do_schema_version(int argc OVS_UNUSED, char *argv[]) } static void -do_schema_cksum(int argc OVS_UNUSED, char *argv[]) +do_schema_cksum(int argc, char *argv[]) { - const char *schema_file_name = argv[1]; + const char *schema_file_name = argc >= 2 ? argv[1] : default_schema(); struct ovsdb_schema *schema; check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema)); @@ -306,8 +345,10 @@ do_schema_cksum(int argc OVS_UNUSED, char *argv[]) } static void -transact(bool read_only, const char *db_file_name, const char *transaction) +transact(bool read_only, int argc, char *argv[]) { + const char *db_file_name = argc >= 3 ? argv[1] : default_db(); + const char *transaction = argv[argc - 1]; struct json *request, *result; struct ovsdb *db; @@ -322,15 +363,15 @@ transact(bool read_only, const char *db_file_name, const char *transaction) } static void -do_query(int argc OVS_UNUSED, char *argv[]) +do_query(int argc, char *argv[]) { - transact(true, argv[1], argv[2]); + transact(true, argc, argv); } static void -do_transact(int argc OVS_UNUSED, char *argv[]) +do_transact(int argc, char *argv[]) { - transact(false, argv[1], argv[2]); + transact(false, argc, argv); } static void @@ -393,8 +434,8 @@ print_db_changes(struct shash *tables, struct shash *names, ? shash_find_data(&table_schema->columns, column) : NULL); if (column_schema) { - const struct ovsdb_error *error; const struct ovsdb_type *type; + struct ovsdb_error *error; struct ovsdb_datum datum; type = &column_schema->type; @@ -406,6 +447,8 @@ print_db_changes(struct shash *tables, struct shash *names, ds_init(&s); ovsdb_datum_to_string(&datum, type, &s); value_string = ds_steal_cstr(&s); + } else { + ovsdb_error_destroy(error); } } if (!value_string) { @@ -444,9 +487,9 @@ print_db_changes(struct shash *tables, struct shash *names, } static void -do_show_log(int argc OVS_UNUSED, char *argv[]) +do_show_log(int argc, char *argv[]) { - const char *db_file_name = argv[1]; + const char *db_file_name = argc >= 2 ? argv[1] : default_db(); struct shash names; struct ovsdb_log *log; struct ovsdb_schema *schema; @@ -474,11 +517,17 @@ do_show_log(int argc OVS_UNUSED, char *argv[]) date = shash_find_data(json_object(json), "_date"); if (date && date->type == JSON_INTEGER) { - time_t t = json_integer(date); - char s[128]; + long long int t = json_integer(date); + char *s; - strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S", localtime(&t)); - printf(" %s", s); + if (t < INT32_MAX) { + /* Older versions of ovsdb wrote timestamps in seconds. */ + t *= 1000; + } + + s = xastrftime_msec(" %Y-%m-%d %H:%M:%S.###", t, true); + fputs(s, stdout); + free(s); } comment = shash_find_data(json_object(json), "_comment"); @@ -507,17 +556,22 @@ do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) } static const struct command all_commands[] = { - { "create", 2, 2, do_create }, - { "compact", 1, 2, do_compact }, - { "convert", 2, 3, do_convert }, - { "needs-conversion", 2, 2, do_needs_conversion }, - { "db-version", 1, 1, do_db_version }, - { "db-cksum", 1, 1, do_db_cksum }, - { "schema-version", 1, 1, do_schema_version }, - { "schema-cksum", 1, 1, do_schema_cksum }, - { "query", 2, 2, do_query }, - { "transact", 2, 2, do_transact }, - { "show-log", 1, 1, do_show_log }, + { "create", 0, 2, do_create }, + { "compact", 0, 2, do_compact }, + { "convert", 0, 3, do_convert }, + { "needs-conversion", 0, 2, do_needs_conversion }, + { "db-version", 0, 1, do_db_version }, + { "db-cksum", 0, 1, do_db_cksum }, + { "schema-version", 0, 1, do_schema_version }, + { "schema-cksum", 0, 1, do_schema_cksum }, + { "query", 1, 2, do_query }, + { "transact", 1, 2, do_transact }, + { "show-log", 0, 1, do_show_log }, { "help", 0, INT_MAX, do_help }, { NULL, 0, 0, NULL }, }; + +static const struct command *get_all_commands(void) +{ + return all_commands; +}