Stop reloading the router list from disk for no reason when we

run out of reachable directory mirrors. Once upon a time reloading
it would set the 'is_running' flag back to 1 for them. It hasn't
done that for a long time.

svn:r15004

diff --git a/ChangeLog b/ChangeLog
index 9015c68658ec35fe2bed2b80c5585cdc0803183a..b89516f03852966e134d3831ec83bda9ccdfbb59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,10 @@ Changes in version 0.2.1.1-alpha - 2008-??-??
       the second part of bug 681.
     - Make bridge authorities correctly clean extrainfo store from time to
       time.  Bugfix on 0.2.0.x.
+    - Stop reloading the router list from disk for no reason when we
+      run out of reachable directory mirrors. Once upon a time reloading
+      it would set the 'is_running' flag back to 1 for them. It hasn't
+      done that for a long time.
 
   o Minor features:
     - Allow separate log levels to be configured for different logging

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 925111438ee8988ec6a2bbfbf496e1b534d26a93..ca3cb6c0db7c622b5d8a19aa188c3bf0867a9b5c 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -859,21 +859,6 @@ router_pick_directory_server(authority_type_t type, int flags)
   mark_all_trusteddirservers_up();
   /* try again */
   choice = router_pick_directory_server_impl(type, flags);
-  if (choice)
-    return choice;
-
-  /* XXXX021 arma: what's the point of *reloading* and trying again?? -NM */
-  /* XXXX021 <arma> once upon a time, reloading set the is_running back
-     to 1. i think. i bet it has no purpose now. */
-  /* XXXX021 Let's stop reloading in 0.2.1.x, then, and see if anything
-   * breaks -NM */
-  log_info(LD_DIR,"Still no %s router entries. Reloading and trying again.",
-           (flags & PDS_IGNORE_FASCISTFIREWALL) ? "known" : "reachable");
-  if (router_reload_router_list()) {
-    return NULL;
-  }
-  /* give it one last try */
-  choice = router_pick_directory_server_impl(type, flags);
   return choice;
 }