February 2020 - tor-commits - lists.torproject.org

[tor/master] Make ext_orport.c relay-mode-only.
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit a1a3a4d5854e1d44ab7ca7e2a117753a8284a704 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 18 13:20:19 2020 -0500 Make ext_orport.c relay-mode-only. --- changes/ticket33368 | 3 +++ src/feature/relay/ext_orport.h | 37 +++++++++++++++++++++++++++++++++++++ src/feature/relay/include.am | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/changes/ticket33368 b/changes/ticket33368 new file mode 100644 index 000000000..ecc6f66f4 --- /dev/null +++ b/changes/ticket33368 @@ -0,0 +1,3 @@ + o Minor features (client-only compilation): + - Disable more code related to the ext_orport protocol when compiling + without support for relay mode. Closes ticket 33368. diff --git a/src/feature/relay/ext_orport.h b/src/feature/relay/ext_orport.h index d44c97be8..cf13c5d42 100644 --- a/src/feature/relay/ext_orport.h +++ b/src/feature/relay/ext_orport.h @@ -31,6 +31,8 @@ #define EXT_OR_CONN_STATE_FLUSHING 5 #define EXT_OR_CONN_STATE_MAX_ 5 +#ifdef HAVE_MODULE_RELAY + int connection_ext_or_start_auth(or_connection_t *or_conn); void connection_or_set_ext_or_identifier(or_connection_t *conn); @@ -45,6 +47,41 @@ int init_ext_or_cookie_authentication(int is_enabled); char *get_ext_or_auth_cookie_file_name(void); void ext_orport_free_all(void); +#else /* !defined(HAVE_MODULE_RELAY) */ + +static inline int +connection_ext_or_start_auth(or_connection_t *conn) +{ + (void)conn; + tor_assert_nonfatal_unreached(); + return -1; +} +static inline int +connection_ext_or_finished_flushing(or_connection_t *conn) +{ + (void)conn; + tor_assert_nonfatal_unreached(); + return -1; +} +static inline int +connection_ext_or_process_inbuf(or_connection_t *conn) +{ + (void)conn; + tor_assert_nonfatal_unreached(); + return -1; +} +#define connection_or_set_ext_or_identifier(conn) \ + ((void)(conn)) +#define connection_or_remove_from_ext_or_id_map(conn) \ + ((void)(conn)) +#define connection_or_clear_ext_or_id_map() \ + STMT_NIL + +#define get_ext_or_auth_cookie_file_name() \ + (NULL) + +#endif /* defined(HAVE_MODULE_RELAY) */ + #ifdef EXT_ORPORT_PRIVATE STATIC int connection_write_ext_or_command(connection_t *conn, uint16_t command, diff --git a/src/feature/relay/include.am b/src/feature/relay/include.am index a4c025ae1..1cfc0961b 100644 --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@ -2,7 +2,6 @@ # Legacy shared relay code: migrate to the relay module over time LIBTOR_APP_A_SOURCES += \ src/feature/relay/dns.c \ - src/feature/relay/ext_orport.c \ src/feature/relay/onion_queue.c \ src/feature/relay/router.c \ src/feature/relay/routerkeys.c \ @@ -12,6 +11,7 @@ LIBTOR_APP_A_SOURCES += \ # ADD_C_FILE: INSERT SOURCES HERE. MODULE_RELAY_SOURCES = \ + src/feature/relay/ext_orport.c \ src/feature/relay/routermode.c \ src/feature/relay/relay_config.c \ src/feature/relay/relay_periodic.c \

1 0

[tor/master] Merge branch 'extract_ext_orport'
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit 65b75ef3d5628fac8e8eeebaf66c437a505653e0 Merge: 7b6e81f8e 9b21a5d25 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 19 13:55:18 2020 -0500 Merge branch 'extract_ext_orport' changes/ticket33368 | 3 ++ src/app/main/shutdown.c | 3 +- src/core/or/connection_or.c | 69 --------------------------------------- src/core/proto/proto_ext_or.h | 7 ++++ src/feature/client/transports.c | 6 ++-- src/feature/relay/ext_orport.c | 71 +++++++++++++++++++++++++++++++++++++++++ src/feature/relay/ext_orport.h | 50 +++++++++++++++++++++++------ src/feature/relay/include.am | 2 +- 8 files changed, 129 insertions(+), 82 deletions(-) diff --cc src/feature/relay/include.am index 2f730a685,1cfc0961b..5cb0731fb --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@@ -2,10 -2,10 +2,9 @@@ # Legacy shared relay code: migrate to the relay module over time LIBTOR_APP_A_SOURCES += \ src/feature/relay/dns.c \ - src/feature/relay/ext_orport.c \ src/feature/relay/onion_queue.c \ src/feature/relay/router.c \ - src/feature/relay/routerkeys.c \ - src/feature/relay/selftest.c + src/feature/relay/routerkeys.c # The Relay module.

1 0

[tor/master] Note module-local functions in ext_orport.h
by nickm＠torproject.org 19 Feb '20

19 Feb '20

commit 9b21a5d2549bb1ef1ee8f3c8cc92b33ff411ce36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 19 12:12:00 2020 -0500 Note module-local functions in ext_orport.h Since these are only used inside the feature/relay module, they don't need stubs. --- src/feature/relay/ext_orport.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/feature/relay/ext_orport.h b/src/feature/relay/ext_orport.h index b09fe3b57..416c35839 100644 --- a/src/feature/relay/ext_orport.h +++ b/src/feature/relay/ext_orport.h @@ -40,9 +40,10 @@ void connection_or_remove_from_ext_or_id_map(or_connection_t *conn); void connection_or_clear_ext_or_id_map(void); int connection_ext_or_finished_flushing(or_connection_t *conn); int connection_ext_or_process_inbuf(or_connection_t *or_conn); +char *get_ext_or_auth_cookie_file_name(void); +/* (No stub needed for these: they are only called within feature/relay.) */ int init_ext_or_cookie_authentication(int is_enabled); -char *get_ext_or_auth_cookie_file_name(void); void ext_orport_free_all(void); #else /* !defined(HAVE_MODULE_RELAY) */

1 0

[sbws/master] fix: destination: Replace constant name
by juga＠torproject.org 19 Feb '20

19 Feb '20

commit d7acfa7fc24a1d43426d01fc36284564d5b9c9b2 Author: juga0 <juga(a)riseup.net> Date: Wed Feb 19 16:46:52 2020 +0000 fix: destination: Replace constant name to make it consistent with others and shorter. Part of #33033. --- sbws/globals.py | 2 +- sbws/lib/destination.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sbws/globals.py b/sbws/globals.py index 3eb1aa8..a71fbc6 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -140,7 +140,7 @@ NUM_DESTINATION_ATTEMPTS_STORED = 10 DELTA_SECONDS_RETRY_DESTINATION = 60 * 5 # No matter what, do not increase the wait time between destination reties # past this value. -MAX_SECONDS_BETWEEN_DESTINATION_RETRIES = 60 * 60 * 3 +MAX_SECONDS_RETRY_DESTINATION = 60 * 60 * 3 # Number of consecutive times a destination can fail before considering it # not functional. MAX_NUM_DESTINATION_FAILURES = 3 diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index a53b8ca..5330dbf 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -11,7 +11,7 @@ import sbws.util.stem as stem_utils from ..globals import ( MAX_NUM_DESTINATION_FAILURES, DELTA_SECONDS_RETRY_DESTINATION, - MAX_SECONDS_BETWEEN_DESTINATION_RETRIES, + MAX_SECONDS_RETRY_DESTINATION, NUM_DESTINATION_ATTEMPTS_STORED, FACTOR_INCREMENT_DESTINATION_RETRY ) @@ -144,7 +144,7 @@ class Destination: def __init__(self, url, max_dl, verify, max_num_failures=MAX_NUM_DESTINATION_FAILURES, delta_seconds_retry=DELTA_SECONDS_RETRY_DESTINATION, - max_seconds_between_retries=MAX_SECONDS_BETWEEN_DESTINATION_RETRIES, + max_seconds_between_retries=MAX_SECONDS_RETRY_DESTINATION, num_attempts_stored=NUM_DESTINATION_ATTEMPTS_STORED, factor_increment_retry=FACTOR_INCREMENT_DESTINATION_RETRY): """Initalizes the Web server from which the data is downloaded.

1 0

[sbws/master] fix: destination: Set maximum to retry a destination
by juga＠torproject.org 19 Feb '20

19 Feb '20

commit 25bb4476f23c34bc25cf36950924d91549b651ff Author: juga0 <juga(a)riseup.net> Date: Wed Feb 19 16:31:07 2020 +0000 fix: destination: Set maximum to retry a destination otherwise the time to retry a destination could increase too much, as it's being multiplied by 2, and a destination would not recover. Patch submitted by tom. Closes: #33033. --- sbws/globals.py | 3 +++ sbws/lib/destination.py | 45 +++++++++++++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/sbws/globals.py b/sbws/globals.py index 1b34730..3eb1aa8 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -138,6 +138,9 @@ NUM_DESTINATION_ATTEMPTS_STORED = 10 # Because intermitent failures with CDN destinations, start trying again # after 5 min. DELTA_SECONDS_RETRY_DESTINATION = 60 * 5 +# No matter what, do not increase the wait time between destination reties +# past this value. +MAX_SECONDS_BETWEEN_DESTINATION_RETRIES = 60 * 60 * 3 # Number of consecutive times a destination can fail before considering it # not functional. MAX_NUM_DESTINATION_FAILURES = 3 diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index 3ccd94f..a53b8ca 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -11,6 +11,7 @@ import sbws.util.stem as stem_utils from ..globals import ( MAX_NUM_DESTINATION_FAILURES, DELTA_SECONDS_RETRY_DESTINATION, + MAX_SECONDS_BETWEEN_DESTINATION_RETRIES, NUM_DESTINATION_ATTEMPTS_STORED, FACTOR_INCREMENT_DESTINATION_RETRY ) @@ -121,7 +122,7 @@ def connect_to_destination_over_circuit(dest, circ_id, session, cont, max_dl): '{} not {}'.format(requests.codes.ok, head.status_code) if 'content-length' not in head.headers: dest.add_failure() - return False, error_prefix + 'we except the header Content-Length '\ + return False, error_prefix + 'we expect the header Content-Length '\ 'to exist in the response' content_length = int(head.headers['content-length']) if max_dl > content_length: @@ -143,6 +144,7 @@ class Destination: def __init__(self, url, max_dl, verify, max_num_failures=MAX_NUM_DESTINATION_FAILURES, delta_seconds_retry=DELTA_SECONDS_RETRY_DESTINATION, + max_seconds_between_retries=MAX_SECONDS_BETWEEN_DESTINATION_RETRIES, num_attempts_stored=NUM_DESTINATION_ATTEMPTS_STORED, factor_increment_retry=FACTOR_INCREMENT_DESTINATION_RETRY): """Initalizes the Web server from which the data is downloaded. @@ -169,6 +171,8 @@ class Destination: # Default delta time to try a destination that was not functional. self._default_delta_seconds_retry = delta_seconds_retry self._delta_seconds_retry = delta_seconds_retry + # A cap on the time to wait between destination retries. + self._max_seconds_between_retries = max_seconds_between_retries # Using a deque (FIFO) to do not grow forever and # to do not have to remove old attempts. # Store tuples of timestamp and whether the destination succed or not @@ -201,20 +205,30 @@ class Destination: Increment the time a destination will be tried again by a ``factor``. """ self._delta_seconds_retry *= factor or self._factor - log.info("Incremented the time to try destination %s to %s hours.", - self.url, self._delta_seconds_retry / 60 / 60) + if self._delta_seconds_retry > self._max_seconds_between_retries: + self._delta_seconds_retry = self._max_seconds_between_retries + log.info("Incremented the time to try destination %s past the " + "limit, capping it at %s hours.", + self.url, self._delta_seconds_retry / 60 / 60) + else: + log.info("Incremented the time to try destination %s to %s hours.", + self.url, self._delta_seconds_retry / 60 / 60) - def _is_last_try_old_enough(self, n=None): + def _get_last_try_in_seconds_ago(self): """ - Return True if the last time it was used it was ``n`` seconds ago. + Return the delta between the last try and now, as positive seconds. """ # Timestamp of the last attempt. last_time = self._attempts[-1][0] + return (datetime.datetime.utcnow() - last_time).total_seconds() + + def _is_last_try_old_enough(self, n=None): + """ + Return True if the last time it was used it was ``n`` seconds ago. + """ # If the last attempt is older than _delta_seconds_retry, try again - return (datetime.datetime.utcnow() - - datetime.timedelta(seconds=self._delta_seconds_retry) - > last_time) - return False + return (self._get_last_try_in_seconds_ago() > + self._delta_seconds_retry) def is_functional(self): """Whether connections to a destination are failing or not. @@ -238,18 +252,21 @@ class Destination: if self._are_last_attempts_failures(): # The log here will appear in all the the queued # relays and threads. - log.warning("The last %s times the destination %s failed." - "Disabled for %s minutes.", + log.warning("The last %s times the destination %s failed. " + "It last ran %s seconds ago. " + "Disabled for %s seconds.", self._max_num_failures, self.url, - self._delta_seconds_retry / 60) + self._get_last_try_in_seconds_ago(), + self._delta_seconds_retry) log.warning("Please, add more destinations or increment the " "number of maximum number of consecutive failures " "in the configuration.") # It was not used for a while and the last time it was used # was long ago, then try again if self._is_last_try_old_enough(): - log.info("The destination %s was not tried for %s hours, " - "it is going to by tried again.") + log.info("The destination %s was not tried for %s seconds, " + "it is going to by tried again.", self.url, + self._get_last_try_in_seconds_ago()) # Set the next time to retry higher, in case this attempt fails self._increment_time_to_retry() return True

1 0

[sbws/master] fix: tests: Test maximum retry delta in destination
by juga＠torproject.org 19 Feb '20

19 Feb '20

commit c36518cb39c965733d7734c328597260d30f255d Author: juga0 <juga(a)riseup.net> Date: Wed Feb 19 17:00:14 2020 +0000 fix: tests: Test maximum retry delta in destination --- tests/unit/lib/test_destination.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/unit/lib/test_destination.py b/tests/unit/lib/test_destination.py index ca2ff21..b5a766f 100644 --- a/tests/unit/lib/test_destination.py +++ b/tests/unit/lib/test_destination.py @@ -1,6 +1,7 @@ """Unit tests for sbws.lib.destination.""" from datetime import datetime, timedelta +from sbws.globals import MAX_SECONDS_RETRY_DESTINATION from sbws.lib import destination @@ -8,6 +9,12 @@ def test_destination_is_functional(): eleven_mins_ago = datetime.utcnow() - timedelta(minutes=11) six_mins_ago = datetime.utcnow() - timedelta(minutes=6) four_mins_ago = datetime.utcnow() - timedelta(minutes=4) + # Make last time tried a bit bigger than the half of the maximum, so that + # it's bigger than the delta time to retry, and when delta time to retry + # is muliplied by a factor (2) it reaches the maximum. + long_ago = datetime.utcnow() - timedelta( + (MAX_SECONDS_RETRY_DESTINATION / 2) + 2 + ) d = destination.Destination('unexistenturl', 0, False) assert d.is_functional() @@ -52,3 +59,16 @@ def test_destination_is_functional(): assert d.is_functional() # And the delta to try is resetted assert not d._is_last_try_old_enough() + + # When the delta time to retry a destination increase too much, + # set it to a maximum, and try the destination again + d.add_failure() + d.add_failure() + d.add_failure(long_ago) + # Pretend the delta seconds was already set to a bit more than + # half the maximum. + d._delta_seconds_retry = (MAX_SECONDS_RETRY_DESTINATION / 2) + 1 + assert d._are_last_attempts_failures() + assert d._is_last_try_old_enough() + assert d.is_functional() + assert d._delta_seconds_retry == MAX_SECONDS_RETRY_DESTINATION

1 0

[sbws/master] Merge branch 'maint-1.1'
by juga＠torproject.org 19 Feb '20

19 Feb '20

commit 205eefd1af9ea38098b8cab7cf7251671cf47f73 Merge: 44ece91 c36518c Author: juga0 <juga(a)riseup.net> Date: Wed Feb 19 18:50:40 2020 +0000 Merge branch 'maint-1.1' sbws/globals.py | 3 +++ sbws/lib/destination.py | 45 ++++++++++++++++++++++++++------------ tests/unit/lib/test_destination.py | 20 +++++++++++++++++ 3 files changed, 54 insertions(+), 14 deletions(-)

1 0

[sbws/maint-1.1] fix: destination: Replace constant name
by juga＠torproject.org 19 Feb '20

19 Feb '20

commit d7acfa7fc24a1d43426d01fc36284564d5b9c9b2 Author: juga0 <juga(a)riseup.net> Date: Wed Feb 19 16:46:52 2020 +0000 fix: destination: Replace constant name to make it consistent with others and shorter. Part of #33033. --- sbws/globals.py | 2 +- sbws/lib/destination.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sbws/globals.py b/sbws/globals.py index 3eb1aa8..a71fbc6 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -140,7 +140,7 @@ NUM_DESTINATION_ATTEMPTS_STORED = 10 DELTA_SECONDS_RETRY_DESTINATION = 60 * 5 # No matter what, do not increase the wait time between destination reties # past this value. -MAX_SECONDS_BETWEEN_DESTINATION_RETRIES = 60 * 60 * 3 +MAX_SECONDS_RETRY_DESTINATION = 60 * 60 * 3 # Number of consecutive times a destination can fail before considering it # not functional. MAX_NUM_DESTINATION_FAILURES = 3 diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index a53b8ca..5330dbf 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -11,7 +11,7 @@ import sbws.util.stem as stem_utils from ..globals import ( MAX_NUM_DESTINATION_FAILURES, DELTA_SECONDS_RETRY_DESTINATION, - MAX_SECONDS_BETWEEN_DESTINATION_RETRIES, + MAX_SECONDS_RETRY_DESTINATION, NUM_DESTINATION_ATTEMPTS_STORED, FACTOR_INCREMENT_DESTINATION_RETRY ) @@ -144,7 +144,7 @@ class Destination: def __init__(self, url, max_dl, verify, max_num_failures=MAX_NUM_DESTINATION_FAILURES, delta_seconds_retry=DELTA_SECONDS_RETRY_DESTINATION, - max_seconds_between_retries=MAX_SECONDS_BETWEEN_DESTINATION_RETRIES, + max_seconds_between_retries=MAX_SECONDS_RETRY_DESTINATION, num_attempts_stored=NUM_DESTINATION_ATTEMPTS_STORED, factor_increment_retry=FACTOR_INCREMENT_DESTINATION_RETRY): """Initalizes the Web server from which the data is downloaded.

1 0

[sbws/maint-1.1] fix: destination: Set maximum to retry a destination
by juga＠torproject.org 19 Feb '20

19 Feb '20

commit 25bb4476f23c34bc25cf36950924d91549b651ff Author: juga0 <juga(a)riseup.net> Date: Wed Feb 19 16:31:07 2020 +0000 fix: destination: Set maximum to retry a destination otherwise the time to retry a destination could increase too much, as it's being multiplied by 2, and a destination would not recover. Patch submitted by tom. Closes: #33033. --- sbws/globals.py | 3 +++ sbws/lib/destination.py | 45 +++++++++++++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/sbws/globals.py b/sbws/globals.py index 1b34730..3eb1aa8 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -138,6 +138,9 @@ NUM_DESTINATION_ATTEMPTS_STORED = 10 # Because intermitent failures with CDN destinations, start trying again # after 5 min. DELTA_SECONDS_RETRY_DESTINATION = 60 * 5 +# No matter what, do not increase the wait time between destination reties +# past this value. +MAX_SECONDS_BETWEEN_DESTINATION_RETRIES = 60 * 60 * 3 # Number of consecutive times a destination can fail before considering it # not functional. MAX_NUM_DESTINATION_FAILURES = 3 diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index 3ccd94f..a53b8ca 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -11,6 +11,7 @@ import sbws.util.stem as stem_utils from ..globals import ( MAX_NUM_DESTINATION_FAILURES, DELTA_SECONDS_RETRY_DESTINATION, + MAX_SECONDS_BETWEEN_DESTINATION_RETRIES, NUM_DESTINATION_ATTEMPTS_STORED, FACTOR_INCREMENT_DESTINATION_RETRY ) @@ -121,7 +122,7 @@ def connect_to_destination_over_circuit(dest, circ_id, session, cont, max_dl): '{} not {}'.format(requests.codes.ok, head.status_code) if 'content-length' not in head.headers: dest.add_failure() - return False, error_prefix + 'we except the header Content-Length '\ + return False, error_prefix + 'we expect the header Content-Length '\ 'to exist in the response' content_length = int(head.headers['content-length']) if max_dl > content_length: @@ -143,6 +144,7 @@ class Destination: def __init__(self, url, max_dl, verify, max_num_failures=MAX_NUM_DESTINATION_FAILURES, delta_seconds_retry=DELTA_SECONDS_RETRY_DESTINATION, + max_seconds_between_retries=MAX_SECONDS_BETWEEN_DESTINATION_RETRIES, num_attempts_stored=NUM_DESTINATION_ATTEMPTS_STORED, factor_increment_retry=FACTOR_INCREMENT_DESTINATION_RETRY): """Initalizes the Web server from which the data is downloaded. @@ -169,6 +171,8 @@ class Destination: # Default delta time to try a destination that was not functional. self._default_delta_seconds_retry = delta_seconds_retry self._delta_seconds_retry = delta_seconds_retry + # A cap on the time to wait between destination retries. + self._max_seconds_between_retries = max_seconds_between_retries # Using a deque (FIFO) to do not grow forever and # to do not have to remove old attempts. # Store tuples of timestamp and whether the destination succed or not @@ -201,20 +205,30 @@ class Destination: Increment the time a destination will be tried again by a ``factor``. """ self._delta_seconds_retry *= factor or self._factor - log.info("Incremented the time to try destination %s to %s hours.", - self.url, self._delta_seconds_retry / 60 / 60) + if self._delta_seconds_retry > self._max_seconds_between_retries: + self._delta_seconds_retry = self._max_seconds_between_retries + log.info("Incremented the time to try destination %s past the " + "limit, capping it at %s hours.", + self.url, self._delta_seconds_retry / 60 / 60) + else: + log.info("Incremented the time to try destination %s to %s hours.", + self.url, self._delta_seconds_retry / 60 / 60) - def _is_last_try_old_enough(self, n=None): + def _get_last_try_in_seconds_ago(self): """ - Return True if the last time it was used it was ``n`` seconds ago. + Return the delta between the last try and now, as positive seconds. """ # Timestamp of the last attempt. last_time = self._attempts[-1][0] + return (datetime.datetime.utcnow() - last_time).total_seconds() + + def _is_last_try_old_enough(self, n=None): + """ + Return True if the last time it was used it was ``n`` seconds ago. + """ # If the last attempt is older than _delta_seconds_retry, try again - return (datetime.datetime.utcnow() - - datetime.timedelta(seconds=self._delta_seconds_retry) - > last_time) - return False + return (self._get_last_try_in_seconds_ago() > + self._delta_seconds_retry) def is_functional(self): """Whether connections to a destination are failing or not. @@ -238,18 +252,21 @@ class Destination: if self._are_last_attempts_failures(): # The log here will appear in all the the queued # relays and threads. - log.warning("The last %s times the destination %s failed." - "Disabled for %s minutes.", + log.warning("The last %s times the destination %s failed. " + "It last ran %s seconds ago. " + "Disabled for %s seconds.", self._max_num_failures, self.url, - self._delta_seconds_retry / 60) + self._get_last_try_in_seconds_ago(), + self._delta_seconds_retry) log.warning("Please, add more destinations or increment the " "number of maximum number of consecutive failures " "in the configuration.") # It was not used for a while and the last time it was used # was long ago, then try again if self._is_last_try_old_enough(): - log.info("The destination %s was not tried for %s hours, " - "it is going to by tried again.") + log.info("The destination %s was not tried for %s seconds, " + "it is going to by tried again.", self.url, + self._get_last_try_in_seconds_ago()) # Set the next time to retry higher, in case this attempt fails self._increment_time_to_retry() return True

1 0

[sbws/maint-1.1] fix: tests: Test maximum retry delta in destination
by juga＠torproject.org 19 Feb '20

19 Feb '20

commit c36518cb39c965733d7734c328597260d30f255d Author: juga0 <juga(a)riseup.net> Date: Wed Feb 19 17:00:14 2020 +0000 fix: tests: Test maximum retry delta in destination --- tests/unit/lib/test_destination.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/unit/lib/test_destination.py b/tests/unit/lib/test_destination.py index ca2ff21..b5a766f 100644 --- a/tests/unit/lib/test_destination.py +++ b/tests/unit/lib/test_destination.py @@ -1,6 +1,7 @@ """Unit tests for sbws.lib.destination.""" from datetime import datetime, timedelta +from sbws.globals import MAX_SECONDS_RETRY_DESTINATION from sbws.lib import destination @@ -8,6 +9,12 @@ def test_destination_is_functional(): eleven_mins_ago = datetime.utcnow() - timedelta(minutes=11) six_mins_ago = datetime.utcnow() - timedelta(minutes=6) four_mins_ago = datetime.utcnow() - timedelta(minutes=4) + # Make last time tried a bit bigger than the half of the maximum, so that + # it's bigger than the delta time to retry, and when delta time to retry + # is muliplied by a factor (2) it reaches the maximum. + long_ago = datetime.utcnow() - timedelta( + (MAX_SECONDS_RETRY_DESTINATION / 2) + 2 + ) d = destination.Destination('unexistenturl', 0, False) assert d.is_functional() @@ -52,3 +59,16 @@ def test_destination_is_functional(): assert d.is_functional() # And the delta to try is resetted assert not d._is_last_try_old_enough() + + # When the delta time to retry a destination increase too much, + # set it to a maximum, and try the destination again + d.add_failure() + d.add_failure() + d.add_failure(long_ago) + # Pretend the delta seconds was already set to a bit more than + # half the maximum. + d._delta_seconds_retry = (MAX_SECONDS_RETRY_DESTINATION / 2) + 1 + assert d._are_last_attempts_failures() + assert d._is_last_try_old_enough() + assert d.is_functional() + assert d._delta_seconds_retry == MAX_SECONDS_RETRY_DESTINATION

1 0