X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Ffile.c;h=605e9cba32f3a2d5e2ae308776b51cac1a674150;hb=142e1f5c7e3b607ccf82d3989477e93adc59c8b6;hp=9f0ab28043ac11148539ee9d33475e793c41a2d4;hpb=5f8e32136eacbc91b7422b17d8208a64cfb3b8b9;p=openvswitch

diff --git a/ovsdb/file.c b/ovsdb/file.c
index 9f0ab280..605e9cba 100644
--- a/ovsdb/file.c
+++ b/ovsdb/file.c
@@ -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_error_destroy(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);