Global replace of Nicira Networks.

[sliver-openvswitch.git] / ovsdb / file.c

diff --git a/ovsdb/file.c b/ovsdb/file.c
index bf72316..c51f752 100644 (file)
--- a/ovsdb/file.c
+++ b/ovsdb/file.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 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.
@@ -215,6 +215,7 @@ ovsdb_file_open__(const char *file_name,
                                          &date, &txn);
         json_destroy(json);
         if (error) {
+            ovsdb_log_unread(log);
             break;
         }
 
@@ -223,14 +224,18 @@ ovsdb_file_open__(const char *file_name,
             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);
@@ -328,10 +333,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;
     }
 }
@@ -595,7 +599,7 @@ ovsdb_file_commit(struct ovsdb_replica *replica,
     /* 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)
@@ -605,7 +609,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;