[tor-commits] [tor/release-0.3.1] Don't do expensive consensus stuff when not a cache.

[nickm@xxxxxxxxxxxxxx]

commit 86ee35ad5b5240b16d3f231f66f744ce7cc3c293
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Aug 23 10:22:51 2017 -0400

    Don't do expensive consensus stuff when not a cache.
    
    This includes generating and storing compressed consensuses, and
    consensus diffs.  Fixes bug 23275; bugfix on 0.3.1.1-alpha.
---
 changes/bug23275       | 5 +++++
 src/or/main.c          | 2 +-
 src/or/networkstatus.c | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/bug23275 b/changes/bug23275
new file mode 100644
index 000000000..d6c3c4774
--- /dev/null
+++ b/changes/bug23275
@@ -0,0 +1,5 @@
+  o Minor bugfixes (relay):
+    - When a relay is not running as a directory cache, it will no longer
+      generate compressed consensuses and consensus diff information.
+      Previously, this was a waste of disk and CPU.  Fixes bug 23275;
+      bugfix on 0.3.1.1-alpha.
diff --git a/src/or/main.c b/src/or/main.c
index cb24fd18c..7b1f4975f 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1487,7 +1487,7 @@ run_scheduled_events(time_t now)
 
   /* 12. launch diff computations.  (This is free if there are none to
    * launch.) */
-  if (server_mode(options)) {
+  if (dir_server_mode(options)) {
     consdiffmgr_rescan();
   }
 }
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 25d79139b..997280de5 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2014,7 +2014,7 @@ networkstatus_set_current_consensus(const char *consensus,
                                                &c->digests,
                                                c->digest_sha3_as_signed,
                                                c->valid_after);
-    if (server_mode(get_options())) {
+    if (dir_server_mode(get_options())) {
       consdiffmgr_add_consensus(consensus, c);
     }
   }



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits