/*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010 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 "command-line.h"
#include "compiler.h"
#include "file.h"
+#include "lockfile.h"
+#include "log.h"
#include "json.h"
#include "ovsdb.h"
#include "ovsdb-error.h"
+#include "socket-util.h"
#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;
static const struct command all_commands[];
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);
parse_options(int argc, char *argv[])
{
static struct option long_options[] = {
+ {"more", no_argument, 0, 'm'},
{"verbose", optional_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
}
switch (c) {
+ case 'm':
+ show_log_verbosity++;
+ break;
+
case 'h':
usage();
"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"
" extract-schema DB print DB's schema on stdout\n"
" query DB TRNS execute read-only transaction on DB\n"
- " transact DB TRNS execute read/write 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);
vlog_usage();
printf("\nOther options:\n"
+ " -m, --more increase show-log verbosity\n"
" -h, --help display this help message\n"
" -V, --version display version information\n");
exit(EXIT_SUCCESS);
}
\f
static void
-do_create(int argc UNUSED, char *argv[])
+do_create(int argc OVS_UNUSED, char *argv[])
{
const char *db_file_name = argv[1];
const char *schema_file_name = argv[2];
struct ovsdb_schema *schema;
- struct ovsdb_file *db_file;
+ struct ovsdb_log *log;
struct json *json;
/* Read schema from file and convert to JSON. */
check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &schema));
json = ovsdb_schema_to_json(schema);
+ ovsdb_schema_destroy(schema);
/* Create database file. */
- check_ovsdb_error(ovsdb_file_open(db_file_name, O_RDWR | O_CREAT | O_EXCL,
- &db_file));
- check_ovsdb_error(ovsdb_file_write(db_file, json));
- check_ovsdb_error(ovsdb_file_commit(db_file));
- ovsdb_file_close(db_file);
+ check_ovsdb_error(ovsdb_log_open(db_file_name, OVSDB_LOG_CREATE,
+ -1, &log));
+ check_ovsdb_error(ovsdb_log_write(log, json));
+ check_ovsdb_error(ovsdb_log_commit(log));
+ ovsdb_log_close(log);
json_destroy(json);
}
+static void
+compact_or_convert(const char *src_name, const char *dst_name,
+ const struct ovsdb_schema *new_schema,
+ const char *comment)
+{
+ struct lockfile *src_lock;
+ struct lockfile *dst_lock;
+ bool in_place = dst_name == NULL;
+ struct ovsdb *db;
+ int retval;
+
+ /* Lock the source, if we will be replacing it. */
+ if (in_place) {
+ retval = lockfile_lock(src_name, 0, &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);
+ if (retval) {
+ ovs_fatal(retval, "%s: failed to lock lockfile", 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, NULL));
+ check_ovsdb_error(ovsdb_file_save_copy(dst_name, false, comment, db));
+ ovsdb_destroy(db);
+
+ /* Replace source. */
+ if (in_place) {
+ if (rename(dst_name, src_name)) {
+ ovs_fatal(errno, "failed to rename \"%s\" to \"%s\"",
+ dst_name, src_name);
+ }
+ fsync_parent_dir(dst_name);
+ lockfile_unlock(src_lock);
+ }
+
+ lockfile_unlock(dst_lock);
+}
+
+static void
+do_compact(int argc OVS_UNUSED, char *argv[])
+{
+ compact_or_convert(argv[1], argv[2], NULL, "compacted by ovsdb-tool");
+}
+
+static void
+do_convert(int argc OVS_UNUSED, char *argv[])
+{
+ const char *schema_file_name = argv[2];
+ 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");
+ ovsdb_schema_destroy(new_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_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);
}
static void
-do_query(int argc UNUSED, char *argv[])
+do_query(int argc OVS_UNUSED, char *argv[])
{
transact(true, argv[1], argv[2]);
}
static void
-do_transact(int argc UNUSED, char *argv[])
+do_transact(int argc OVS_UNUSED, char *argv[])
{
transact(false, argv[1], argv[2]);
}
static void
-do_help(int argc UNUSED, char *argv[] UNUSED)
+print_db_changes(struct shash *tables, struct shash *names)
+{
+ struct shash_node *n1;
+
+ SHASH_FOR_EACH (n1, tables) {
+ const char *table = n1->name;
+ struct json *rows = n1->data;
+ struct shash_node *n2;
+
+ if (n1->name[0] == '_' || rows->type != JSON_OBJECT) {
+ continue;
+ }
+
+ SHASH_FOR_EACH (n2, json_object(rows)) {
+ const char *row_uuid = n2->name;
+ struct json *columns = n2->data;
+ struct shash_node *n3;
+ char *old_name, *new_name;
+ bool free_new_name = false;
+
+ old_name = new_name = shash_find_data(names, row_uuid);
+ if (columns->type == JSON_OBJECT) {
+ struct json *new_name_json;
+
+ new_name_json = shash_find_data(json_object(columns), "name");
+ if (new_name_json) {
+ new_name = json_to_string(new_name_json, JSSF_SORT);
+ free_new_name = true;
+ }
+ }
+
+ printf("\ttable %s", table);
+
+ if (!old_name) {
+ if (new_name) {
+ printf(" insert row %s:\n", new_name);
+ } else {
+ printf(" insert row %.8s:\n", row_uuid);
+ }
+ } else {
+ printf(" row %s:\n", old_name);
+ }
+
+ if (columns->type == JSON_OBJECT) {
+ if (show_log_verbosity > 1) {
+ SHASH_FOR_EACH (n3, json_object(columns)) {
+ const char *column = n3->name;
+ struct json *value = n3->data;
+ char *value_string;
+
+ value_string = json_to_string(value, JSSF_SORT);
+ printf("\t\t%s=%s\n", column, value_string);
+ free(value_string);
+ }
+ }
+ if (!old_name
+ || (new_name != old_name && strcmp(old_name, new_name))) {
+ if (old_name) {
+ shash_delete(names, shash_find(names, row_uuid));
+ free(old_name);
+ }
+ shash_add(names, row_uuid, (new_name
+ ? xstrdup(new_name)
+ : xmemdup0(row_uuid, 8)));
+ }
+ } else if (columns->type == JSON_NULL) {
+ struct shash_node *node;
+
+ printf("\t\tdelete row\n");
+ node = shash_find(names, row_uuid);
+ if (node) {
+ shash_delete(names, node);
+ }
+ free(old_name);
+ }
+
+ if (free_new_name) {
+ free(new_name);
+ }
+ }
+ }
+}
+
+static void
+do_show_log(int argc OVS_UNUSED, char *argv[])
+{
+ const char *db_file_name = argv[1];
+ struct shash names;
+ struct ovsdb_log *log;
+ unsigned int i;
+
+ check_ovsdb_error(ovsdb_log_open(db_file_name, OVSDB_LOG_READ_ONLY,
+ -1, &log));
+ shash_init(&names);
+ for (i = 0; ; i++) {
+ struct json *json;
+
+ check_ovsdb_error(ovsdb_log_read(log, &json));
+ if (!json) {
+ break;
+ }
+
+ printf("record %u:", i);
+ if (json->type == JSON_OBJECT) {
+ struct json *date, *comment;
+
+ date = shash_find_data(json_object(json), "_date");
+ if (date && date->type == JSON_INTEGER) {
+ time_t t = json_integer(date);
+ char s[128];
+
+ strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S", localtime(&t));
+ printf(" %s", s);
+ }
+
+ comment = shash_find_data(json_object(json), "_comment");
+ if (comment && comment->type == JSON_STRING) {
+ printf(" \"%s\"", json_string(comment));
+ }
+
+ if (i > 0 && show_log_verbosity > 0) {
+ putchar('\n');
+ print_db_changes(json_object(json), &names);
+ }
+ }
+ json_destroy(json);
+ putchar('\n');
+ }
+
+ /* XXX free 'names'. */
+}
+
+static void
+do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
{
usage();
}
static const struct command all_commands[] = {
{ "create", 2, 2, do_create },
+ { "compact", 1, 2, do_compact },
+ { "convert", 2, 3, do_convert },
{ "query", 2, 2, do_query },
{ "transact", 2, 2, do_transact },
+ { "show-log", 1, 1, do_show_log },
{ "help", 0, INT_MAX, do_help },
{ NULL, 0, 0, NULL },
};