From: Ben Pfaff <blp@nicira.com>
Date: Wed, 26 Jan 2011 00:50:44 +0000 (-0800)
Subject: ovsdb: Synchronize comments and code in ovsdb_file_commit().
X-Git-Tag: v1.2.0~126
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8c7ea6a0c0d44f707eef136b77ac0dd1c55509a4;p=sliver-openvswitch.git

ovsdb: Synchronize comments and code in ovsdb_file_commit().

The comments and the code didn't match, so make them agree.
---

diff --git a/ovsdb/file.c b/ovsdb/file.c
index 605e9cba3..9eea460d4 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;