aboutsummaryrefslogtreecommitdiff
path: root/ovsdb
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2011-01-25 16:50:44 -0800
committerBen Pfaff <blp@nicira.com>2011-06-24 09:17:49 -0700
commit8c7ea6a0c0d44f707eef136b77ac0dd1c55509a4 (patch)
tree2e1f441e178934eaf9f8eedce55151bfe9ca645b /ovsdb
parentdc2882fad778a53bcff9da1d018685e666d110a6 (diff)
ovsdb: Synchronize comments and code in ovsdb_file_commit().
The comments and the code didn't match, so make them agree.
Diffstat (limited to 'ovsdb')
-rw-r--r--ovsdb/file.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ovsdb/file.c b/ovsdb/file.c
index 605e9cba..9eea460d 100644
--- a/ovsdb/file.c
+++ b/ovsdb/file.c
@@ -600,7 +600,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)
@@ -610,7 +610,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;