X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb-tool.c;h=2754909908cc9f46e96cb9e73bfe35379ce5ebd4;hb=81e2083fe6b7c16055f01c4b1e40f25867594bf6;hp=26f9003bd9c1f8bef8e94dd5e9d2ee6df5a76787;hpb=02dd3123a0e312f1d33403e744af52dd6096f12d;p=sliver-openvswitch.git diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c index 26f9003bd..275490990 100644 --- a/ovsdb/ovsdb-tool.c +++ b/ovsdb/ovsdb-tool.c @@ -1,5 +1,5 @@ /* - * 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. @@ -34,9 +34,9 @@ #include "table.h" #include "timeval.h" #include "util.h" - #include "vlog.h" -#define THIS_MODULE VLM_ovsdb_tool + +VLOG_DEFINE_THIS_MODULE(ovsdb_tool); /* -m, --more: Verbosity level for "show-log" command output. */ static int show_log_verbosity; @@ -50,8 +50,6 @@ int main(int argc, char *argv[]) { set_program_name(argv[0]); - time_init(); - vlog_init(); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); run_command(argc - optind, argv + optind, all_commands); @@ -112,7 +110,10 @@ usage(void) " 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" - " extract-schema DB print DB's schema on stdout\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", @@ -187,18 +188,19 @@ compact_or_convert(const char *src_name, const char *dst_name, struct ovsdb *db; int retval; - /* Get (temporary) destination. */ + /* Lock the source, if we will be replacing it. */ if (in_place) { - dst_name = xasprintf("%s.tmp", src_name); + retval = lockfile_lock(src_name, 0, &src_lock); + if (retval) { + ovs_fatal(retval, "%s: failed to lock lockfile", src_name); + } } - /* Lock source and (temporary) destination. */ - retval = lockfile_lock(src_name, INT_MAX, &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, INT_MAX, &dst_lock); + retval = lockfile_lock(dst_name, 0, &dst_lock); if (retval) { ovs_fatal(retval, "%s: failed to lock lockfile", dst_name); } @@ -206,7 +208,7 @@ compact_or_convert(const char *src_name, const char *dst_name, /* Save a copy. */ check_ovsdb_error(new_schema ? ovsdb_file_open_as_schema(src_name, new_schema, &db) - : ovsdb_file_open(src_name, true, &db)); + : ovsdb_file_open(src_name, true, &db, NULL)); check_ovsdb_error(ovsdb_file_save_copy(dst_name, false, comment, db)); ovsdb_destroy(db); @@ -217,7 +219,6 @@ compact_or_convert(const char *src_name, const char *dst_name, dst_name, src_name); } fsync_parent_dir(dst_name); - } else { lockfile_unlock(src_lock); } @@ -242,13 +243,71 @@ do_convert(int argc OVS_UNUSED, char *argv[]) ovsdb_schema_destroy(new_schema); } +static void +do_needs_conversion(int argc OVS_UNUSED, char *argv[]) +{ + const char *db_file_name = argv[1]; + const char *schema_file_name = argv[2]; + struct ovsdb_schema *schema1, *schema2; + + check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema1)); + check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema2)); + puts(ovsdb_schema_equal(schema1, schema2) ? "no" : "yes"); + ovsdb_schema_destroy(schema1); + ovsdb_schema_destroy(schema2); +} + +static void +do_db_version(int argc OVS_UNUSED, char *argv[]) +{ + const char *db_file_name = argv[1]; + struct ovsdb_schema *schema; + + check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema)); + puts(schema->version); + ovsdb_schema_destroy(schema); +} + +static void +do_db_cksum(int argc OVS_UNUSED, char *argv[]) +{ + const char *db_file_name = argv[1]; + struct ovsdb_schema *schema; + + check_ovsdb_error(ovsdb_file_read_schema(db_file_name, &schema)); + puts(schema->cksum); + ovsdb_schema_destroy(schema); +} + +static void +do_schema_version(int argc OVS_UNUSED, char *argv[]) +{ + const char *schema_file_name = argv[1]; + struct ovsdb_schema *schema; + + check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema)); + puts(schema->version); + ovsdb_schema_destroy(schema); +} + +static void +do_schema_cksum(int argc OVS_UNUSED, char *argv[]) +{ + const char *schema_file_name = argv[1]; + struct ovsdb_schema *schema; + + check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema)); + puts(schema->cksum); + ovsdb_schema_destroy(schema); +} + static void transact(bool read_only, const char *db_file_name, const char *transaction) { struct json *request, *result; struct ovsdb *db; - check_ovsdb_error(ovsdb_file_open(db_file_name, read_only, &db)); + check_ovsdb_error(ovsdb_file_open(db_file_name, read_only, &db, NULL)); request = parse_json(transaction); result = ovsdb_execute(db, request, 0, NULL); @@ -337,8 +396,13 @@ print_db_changes(struct shash *tables, struct shash *names) : xmemdup0(row_uuid, 8))); } } else if (columns->type == JSON_NULL) { + struct shash_node *node; + printf("\t\tdelete row\n"); - shash_delete(names, shash_find(names, row_uuid)); + node = shash_find(names, row_uuid); + if (node) { + shash_delete(names, node); + } free(old_name); } @@ -395,6 +459,7 @@ do_show_log(int argc OVS_UNUSED, char *argv[]) putchar('\n'); } + ovsdb_log_close(log); /* XXX free 'names'. */ } @@ -408,6 +473,11 @@ 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 },