[tor-commits] [tor/master] Fix a check for when to rebuild the microdesc cache. (Backport from 0.2.3.

[nickm at torproject.org]

commit 970715dd8f52a79bbaddfcfa5af1f11608ddacf9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 3 16:29:39 2011 -0400

    Fix a check for when to rebuild the microdesc cache. (Backport from 0.2.3.
---
 changes/bug2230_part2 |    5 +++++
 src/or/microdesc.c    |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/changes/bug2230_part2 b/changes/bug2230_part2
new file mode 100644
index 0000000..2664ecc
--- /dev/null
+++ b/changes/bug2230_part2
@@ -0,0 +1,5 @@
+  o Minor bugfixes
+    - The microdesc journal is supposed to get rebuilt only if it is
+      at least _half_ the length of the store, not _twice_ the length
+      of the store.   Bugfix on 0.2.2.6-alpha; fixes part of bug 2230.
+
diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index 3566277..0ceb134 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -208,7 +208,7 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache,
     size_t old_content_len =
       cache->cache_content ? cache->cache_content->size : 0;
     if (cache->journal_len > 16384 + old_content_len &&
-        cache->journal_len > old_content_len * 2) {
+        cache->journal_len > old_content_len / 2) {
       microdesc_cache_rebuild(cache);
     }
   }