git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb: Truncate bad transactions from database log.
[sliver-openvswitch.git]
/
ovsdb
/
file.c
diff --git
a/ovsdb/file.c
b/ovsdb/file.c
index
1425beb
..
605e9cb
100644
(file)
--- 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) {
&date, &txn);
json_destroy(json);
if (error) {
+ ovsdb_log_unread(log);
break;
}
break;
}
@@
-223,7
+224,11
@@
ovsdb_file_open__(const char *file_name,
oldest_commit = date;
}
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
}
if (error) {
/* Log error but otherwise ignore it. Probably the database just got