X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Ffile.c;h=7c8ac6f292a87daa22f91adc4955e2a4ccdf99de;hb=c5cf10598f8c9f4428291e9df3ecd72a05fb1ccf;hp=ddb443a1121b1a399b8885c535bd45f5c7f96440;hpb=4e8e4213a815a30216e855a805a8bcd5b8c5a886;p=sliver-openvswitch.git diff --git a/ovsdb/file.c b/ovsdb/file.c index ddb443a11..7c8ac6f29 100644 --- a/ovsdb/file.c +++ b/ovsdb/file.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010 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. @@ -17,7 +17,6 @@ #include "file.h" -#include #include #include #include @@ -38,7 +37,7 @@ #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(ovsdb_file) +VLOG_DEFINE_THIS_MODULE(ovsdb_file); /* Minimum number of milliseconds between database compactions. */ #define COMPACT_MIN_MSEC (10 * 60 * 1000) /* 10 minutes. */ @@ -69,12 +68,10 @@ static struct ovsdb_error *ovsdb_file_open__(const char *file_name, bool read_only, struct ovsdb **, struct ovsdb_file **); static struct ovsdb_error *ovsdb_file_txn_from_json( - struct ovsdb *, const struct json *, bool converting, - long long int *date, struct ovsdb_txn **); + struct ovsdb *, const struct json *, bool converting, struct ovsdb_txn **); static struct ovsdb_error *ovsdb_file_create(struct ovsdb *, struct ovsdb_log *, const char *file_name, - long long int oldest_commit, unsigned int n_transactions, struct ovsdb_file **filep); @@ -121,24 +118,16 @@ ovsdb_file_open_as_schema(const char *file_name, } 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)); + ovs_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; @@ -153,12 +142,9 @@ ovsdb_file_open__(const char *file_name, 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); @@ -167,35 +153,79 @@ ovsdb_file_open__(const char *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; + 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. */ + ovs_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; while ((error = ovsdb_log_read(log, &json)) == NULL && json) { struct ovsdb_txn *txn; - long long int date; error = ovsdb_file_txn_from_json(db, json, alternate_schema != NULL, - &date, &txn); + &txn); json_destroy(json); if (error) { + ovsdb_log_unread(log); break; } n_transactions++; - if (date < oldest_commit) { - oldest_commit = date; + error = ovsdb_txn_commit(txn, false); + if (error) { + ovsdb_log_unread(log); + break; } - - ovsdb_txn_commit(txn, false); } 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); @@ -204,8 +234,7 @@ ovsdb_file_open__(const char *file_name, if (!read_only) { struct ovsdb_file *file; - error = ovsdb_file_create(db, log, file_name, oldest_commit, - n_transactions, &file); + error = ovsdb_file_create(db, log, file_name, n_transactions, &file); if (error) { goto error; } @@ -225,7 +254,6 @@ error: *filep = NULL; } ovsdb_destroy(db); - ovsdb_schema_destroy(schema); ovsdb_log_close(log); return error; } @@ -294,10 +322,9 @@ ovsdb_file_txn_row_from_json(struct ovsdb_txn *txn, struct ovsdb_table *table, 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; } } @@ -339,22 +366,16 @@ ovsdb_file_txn_table_from_json(struct ovsdb_txn *txn, * * If 'converting' is true, then unknown table and column names are ignored * (which can ease upgrading and downgrading schemas); otherwise, they are - * treated as errors. - * - * If successful, the date associated with the transaction, as the number of - * milliseconds since the epoch, is stored in '*date'. If the transaction does - * not include a date, LLONG_MAX is stored. */ + * treated as errors. */ static struct ovsdb_error * ovsdb_file_txn_from_json(struct ovsdb *db, const struct json *json, - bool converting, long long int *date, - struct ovsdb_txn **txnp) + bool converting, struct ovsdb_txn **txnp) { struct ovsdb_error *error; struct shash_node *node; struct ovsdb_txn *txn; *txnp = NULL; - *date = LLONG_MAX; if (json->type != JSON_OBJECT) { return ovsdb_syntax_error(json, NULL, "object expected"); @@ -370,9 +391,6 @@ ovsdb_file_txn_from_json(struct ovsdb *db, const struct json *json, if (!table) { if (!strcmp(table_name, "_date") && node_json->type == JSON_INTEGER) { - if (date) { - *date = json_integer(node_json); - } continue; } else if (!strcmp(table_name, "_comment") || converting) { continue; @@ -460,6 +478,17 @@ ovsdb_file_save_copy(const char *file_name, int locking, { 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) +{ + ovs_assert(schemap != NULL); + return ovsdb_file_open_log(file_name, OVSDB_LOG_READ_ONLY, NULL, schemap); +} /* Replica implementation. */ @@ -468,7 +497,7 @@ struct ovsdb_file { struct ovsdb *db; struct ovsdb_log *log; char *file_name; - long long int oldest_commit; + long long int last_compact; long long int next_compact; unsigned int n_transactions; }; @@ -478,17 +507,18 @@ static const struct ovsdb_replica_class ovsdb_file_class; static struct ovsdb_error * ovsdb_file_create(struct ovsdb *db, struct ovsdb_log *log, const char *file_name, - long long int oldest_commit, unsigned int n_transactions, struct ovsdb_file **filep) { - long long int now = time_msec(); struct ovsdb_file *file; + char *deref_name; char *abs_name; /* Use the absolute name of the file because ovsdb-server opens its * database before daemonize() chdirs to "/". */ - abs_name = abs_file_name(NULL, file_name); + deref_name = follow_symlinks(file_name); + abs_name = abs_file_name(NULL, deref_name); + free(deref_name); if (!abs_name) { *filep = NULL; return ovsdb_io_error(0, "could not determine current " @@ -500,8 +530,8 @@ ovsdb_file_create(struct ovsdb *db, struct ovsdb_log *log, file->db = db; file->log = log; file->file_name = abs_name; - file->oldest_commit = MIN(oldest_commit, now); - file->next_compact = file->oldest_commit + COMPACT_MIN_MSEC; + file->last_compact = time_msec(); + file->next_compact = file->last_compact + COMPACT_MIN_MSEC; file->n_transactions = n_transactions; ovsdb_add_replica(db, &file->replica); @@ -512,7 +542,7 @@ ovsdb_file_create(struct ovsdb *db, struct ovsdb_log *log, static struct ovsdb_file * ovsdb_file_cast(struct ovsdb_replica *replica) { - assert(replica->class == &ovsdb_file_class); + ovs_assert(replica->class == &ovsdb_file_class); return CONTAINER_OF(replica, struct ovsdb_file, replica); } @@ -549,10 +579,10 @@ ovsdb_file_commit(struct ovsdb_replica *replica, } file->n_transactions++; - /* 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 + /* If it has been at least COMPACT_MIN_MSEC ms since the last time we + * compacted (or at least COMPACT_RETRY_MSEC ms 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) @@ -562,7 +592,8 @@ ovsdb_file_commit(struct ovsdb_replica *replica, 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; @@ -584,7 +615,7 @@ ovsdb_file_compact(struct ovsdb_file *file) comment = xasprintf("compacting database online " "(%.3f seconds old, %u transactions, %llu bytes)", - (time_msec() - file->oldest_commit) / 1000.0, + (time_wall_msec() - file->last_compact) / 1000.0, file->n_transactions, (unsigned long long) ovsdb_log_get_offset(file->log)); VLOG_INFO("%s: %s", file->file_name, comment); @@ -598,7 +629,7 @@ ovsdb_file_compact(struct ovsdb_file *file) /* Lock temporary file. */ tmp_name = xasprintf("%s.tmp", file->file_name); - retval = lockfile_lock(tmp_name, 0, &tmp_lock); + retval = lockfile_lock(tmp_name, &tmp_lock); if (retval) { error = ovsdb_io_error(retval, "could not get lock on %s", tmp_name); goto exit; @@ -629,8 +660,8 @@ exit: if (!error) { ovsdb_log_close(file->log); file->log = new_log; - file->oldest_commit = time_msec(); - file->next_compact = file->oldest_commit + COMPACT_MIN_MSEC; + file->last_compact = time_msec(); + file->next_compact = file->last_compact + COMPACT_MIN_MSEC; file->n_transactions = 1; } else { ovsdb_log_close(new_log); @@ -737,7 +768,7 @@ ovsdb_file_txn_commit(struct json *json, const char *comment, if (comment) { json_object_put_string(json, "_comment", comment); } - json_object_put(json, "_date", json_integer_create(time_wall())); + json_object_put(json, "_date", json_integer_create(time_wall_msec())); error = ovsdb_log_write(log, json); json_destroy(json);