-/* Copyright (c) 2009, 2010 Nicira Networks
+/* Copyright (c) 2009, 2010, 2011 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "transaction.h"
#include "uuid.h"
#include "util.h"
-
-#define THIS_MODULE VLM_ovsdb_file
#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(ovsdb_file);
+
/* Minimum number of milliseconds between database compactions. */
#define COMPACT_MIN_MSEC (10 * 60 * 1000) /* 10 minutes. */
}
static struct ovsdb_error *
-ovsdb_file_open__(const char *file_name,
- const struct ovsdb_schema *alternate_schema,
- bool read_only, struct ovsdb **dbp,
- struct ovsdb_file **filep)
+ovsdb_file_open_log(const char *file_name, enum ovsdb_log_open_mode open_mode,
+ struct ovsdb_log **logp, struct ovsdb_schema **schemap)
{
- enum ovsdb_log_open_mode open_mode;
- long long int oldest_commit;
- unsigned int n_transactions;
struct ovsdb_schema *schema = NULL;
- struct ovsdb_error *error;
struct ovsdb_log *log = NULL;
- struct json *json;
- struct ovsdb *db = NULL;
+ struct ovsdb_error *error;
+ struct json *json = NULL;
- /* In read-only mode there is no ovsdb_file so 'filep' must be null. */
- assert(!(read_only && filep));
+ assert(logp || schemap);
- open_mode = read_only ? OVSDB_LOG_READ_ONLY : OVSDB_LOG_READ_WRITE;
error = ovsdb_log_open(file_name, open_mode, -1, &log);
if (error) {
goto error;
goto error;
}
- if (alternate_schema) {
- schema = ovsdb_schema_clone(alternate_schema);
- } else {
+ if (schemap) {
error = ovsdb_schema_from_json(json, &schema);
if (error) {
- json_destroy(json);
error = ovsdb_wrap_error(error,
"failed to parse \"%s\" as ovsdb schema",
file_name);
}
json_destroy(json);
- db = ovsdb_create(schema);
- schema = NULL;
+ if (logp) {
+ *logp = log;
+ } else {
+ ovsdb_log_close(log);
+ }
+ if (schemap) {
+ *schemap = schema;
+ }
+ return NULL;
+
+error:
+ ovsdb_log_close(log);
+ json_destroy(json);
+ if (logp) {
+ *logp = NULL;
+ }
+ if (schemap) {
+ *schemap = NULL;
+ }
+ return error;
+}
+
+static struct ovsdb_error *
+ovsdb_file_open__(const char *file_name,
+ const struct ovsdb_schema *alternate_schema,
+ bool read_only, struct ovsdb **dbp,
+ struct ovsdb_file **filep)
+{
+ enum ovsdb_log_open_mode open_mode;
+ long long int oldest_commit;
+ unsigned int n_transactions;
+ struct ovsdb_schema *schema = NULL;
+ struct ovsdb_error *error;
+ struct ovsdb_log *log;
+ struct json *json;
+ struct ovsdb *db = NULL;
+
+ /* In read-only mode there is no ovsdb_file so 'filep' must be null. */
+ assert(!(read_only && filep));
+
+ open_mode = read_only ? OVSDB_LOG_READ_ONLY : OVSDB_LOG_READ_WRITE;
+ error = ovsdb_file_open_log(file_name, open_mode, &log,
+ alternate_schema ? NULL : &schema);
+ if (error) {
+ goto error;
+ }
+
+ db = ovsdb_create(schema ? schema : ovsdb_schema_clone(alternate_schema));
oldest_commit = LLONG_MAX;
n_transactions = 0;
&date, &txn);
json_destroy(json);
if (error) {
+ ovsdb_log_unread(log);
break;
}
oldest_commit = date;
}
- ovsdb_txn_commit(txn, false);
+ error = ovsdb_txn_commit(txn, false);
+ if (error) {
+ ovsdb_log_unread(log);
+ break;
+ }
}
if (error) {
/* Log error but otherwise ignore it. Probably the database just got
* truncated due to power failure etc. and we should use its current
* contents. */
char *msg = ovsdb_error_to_string(error);
- VLOG_WARN("%s", msg);
+ VLOG_ERR("%s", msg);
free(msg);
ovsdb_error_destroy(error);
*filep = NULL;
}
ovsdb_destroy(db);
- ovsdb_schema_destroy(schema);
ovsdb_log_close(log);
return error;
}
error = ovsdb_file_update_row_from_json(new, converting, json);
if (error) {
ovsdb_row_destroy(new);
+ } else {
+ ovsdb_txn_row_insert(txn, new);
}
-
- ovsdb_txn_row_insert(txn, new);
-
return error;
}
}
if (!table) {
if (!strcmp(table_name, "_date")
&& node_json->type == JSON_INTEGER) {
- if (date) {
- *date = json_integer(node_json);
- }
+ *date = json_integer(node_json);
continue;
} else if (!strcmp(table_name, "_comment") || converting) {
continue;
const struct ovsdb_table *table = node->data;
const struct ovsdb_row *row;
- HMAP_FOR_EACH (row, struct ovsdb_row, hmap_node, &table->rows) {
+ HMAP_FOR_EACH (row, hmap_node, &table->rows) {
ovsdb_file_txn_add_row(&ftxn, NULL, row, NULL);
}
}
{
return ovsdb_file_save_copy__(file_name, locking, comment, db, NULL);
}
+
+/* Opens database 'file_name', reads its schema, and closes it. On success,
+ * stores the schema into '*schemap' and returns NULL; the caller then owns the
+ * schema. On failure, returns an ovsdb_error (which the caller must destroy)
+ * and sets '*dbp' to NULL. */
+struct ovsdb_error *
+ovsdb_file_read_schema(const char *file_name, struct ovsdb_schema **schemap)
+{
+ assert(schemap != NULL);
+ return ovsdb_file_open_log(file_name, OVSDB_LOG_READ_ONLY, NULL, schemap);
+}
\f
/* Replica implementation. */
/* If it has been at least COMPACT_MIN_MSEC millseconds since the last time
* we compacted (or at least COMPACT_RETRY_MSEC since the last time we
* tried), and if there are at least 100 transactions in the database, and
- * if the database is at least 1 MB, then compact the database. */
+ * if the database is at least 10 MB, then compact the database. */
if (time_msec() >= file->next_compact
&& file->n_transactions >= 100
&& ovsdb_log_get_offset(file->log) >= 10 * 1024 * 1024)
char *s = ovsdb_error_to_string(error);
ovsdb_error_destroy(error);
VLOG_WARN("%s: compacting database failed (%s), retrying in "
- "60 seconds", file->file_name, s);
+ "%d seconds",
+ file->file_name, s, COMPACT_RETRY_MSEC / 1000);
free(s);
file->next_compact = time_msec() + COMPACT_RETRY_MSEC;
if (comment) {
json_object_put_string(json, "_comment", comment);
}
- json_object_put(json, "_date", json_integer_create(time_now()));
+ json_object_put(json, "_date", json_integer_create(time_wall()));
error = ovsdb_log_write(log, json);
json_destroy(json);
git://git.onelab.eu / sliver-openvswitch.git / blobdiff