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

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit 9ef8f5d1b8c646d1383327a3d45cddf27ab4b886 Merge: 2f4fa423c c22696e36 Author: teor <teor(a)torproject.org> Date: Mon Mar 16 20:54:27 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.1] Travis: Produce detailed chutney diagnostics
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit 1c688ba925e17967fa7b2abe2a41327914421fb3 Author: teor <teor(a)torproject.org> Date: Mon Feb 17 17:21:13 2020 +1000 Travis: Produce detailed chutney diagnostics When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool to produce detailed diagnostic output. Closes ticket 32792. --- .travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6047c4470..8bc9898f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -236,7 +236,7 @@ after_failure: ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi - - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi + - if [[ "$CHUTNEY" != "" ]]; then "$CHUTNEY_PATH/tools/diagnostics.sh" || echo "diagnostics failed"; ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi - if [[ "$TEST_STEM" != "" ]]; then tail -1000 "$STEM_SOURCE_DIR"/test/data/tor_log || echo "tail failed"; fi - if [[ "$TEST_STEM" != "" ]]; then grep -v "SocketClosed" stem.log | tail -1000 || echo "grep | tail failed"; fi diff --git a/changes/ticket32792 b/changes/ticket32792 new file mode 100644 index 000000000..553cf0ca8 --- /dev/null +++ b/changes/ticket32792 @@ -0,0 +1,3 @@ + o Testing: + - When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool + to produce detailed diagnostic output. Closes ticket 32792.

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit c22696e3606f9873ddbf02b11dc91214853b8317 Merge: 7a9e2a261 1c688ba92 Author: teor <teor(a)torproject.org> Date: Mon Mar 16 20:54:20 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 .travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Travis: Produce detailed chutney diagnostics
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit 1c688ba925e17967fa7b2abe2a41327914421fb3 Author: teor <teor(a)torproject.org> Date: Mon Feb 17 17:21:13 2020 +1000 Travis: Produce detailed chutney diagnostics When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool to produce detailed diagnostic output. Closes ticket 32792. --- .travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6047c4470..8bc9898f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -236,7 +236,7 @@ after_failure: ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi - - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi + - if [[ "$CHUTNEY" != "" ]]; then "$CHUTNEY_PATH/tools/diagnostics.sh" || echo "diagnostics failed"; ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi - if [[ "$TEST_STEM" != "" ]]; then tail -1000 "$STEM_SOURCE_DIR"/test/data/tor_log || echo "tail failed"; fi - if [[ "$TEST_STEM" != "" ]]; then grep -v "SocketClosed" stem.log | tail -1000 || echo "grep | tail failed"; fi diff --git a/changes/ticket32792 b/changes/ticket32792 new file mode 100644 index 000000000..553cf0ca8 --- /dev/null +++ b/changes/ticket32792 @@ -0,0 +1,3 @@ + o Testing: + - When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool + to produce detailed diagnostic output. Closes ticket 32792.

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit 93d12baf89c2a55b8a3e40a026b3990dd671a1f7 Merge: a255ca9b1 9ef8f5d1b Author: teor <teor(a)torproject.org> Date: Mon Mar 16 20:54:34 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 .travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.3'
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit af713ddb4bf58f1549aed174dbbe0ae780169125 Merge: afbf854ee 93d12baf8 Author: teor <teor(a)torproject.org> Date: Mon Mar 16 20:54:42 2020 +1000 Merge branch 'maint-0.4.3'

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.1
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit c22696e3606f9873ddbf02b11dc91214853b8317 Merge: 7a9e2a261 1c688ba92 Author: teor <teor(a)torproject.org> Date: Mon Mar 16 20:54:20 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.1 .travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit 9ef8f5d1b8c646d1383327a3d45cddf27ab4b886 Merge: 2f4fa423c c22696e36 Author: teor <teor(a)torproject.org> Date: Mon Mar 16 20:54:27 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Travis: Produce detailed chutney diagnostics
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit 1c688ba925e17967fa7b2abe2a41327914421fb3 Author: teor <teor(a)torproject.org> Date: Mon Feb 17 17:21:13 2020 +1000 Travis: Produce detailed chutney diagnostics When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool to produce detailed diagnostic output. Closes ticket 32792. --- .travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6047c4470..8bc9898f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -236,7 +236,7 @@ after_failure: ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi - - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi + - if [[ "$CHUTNEY" != "" ]]; then "$CHUTNEY_PATH/tools/diagnostics.sh" || echo "diagnostics failed"; ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi - if [[ "$TEST_STEM" != "" ]]; then tail -1000 "$STEM_SOURCE_DIR"/test/data/tor_log || echo "tail failed"; fi - if [[ "$TEST_STEM" != "" ]]; then grep -v "SocketClosed" stem.log | tail -1000 || echo "grep | tail failed"; fi diff --git a/changes/ticket32792 b/changes/ticket32792 new file mode 100644 index 000000000..553cf0ca8 --- /dev/null +++ b/changes/ticket32792 @@ -0,0 +1,3 @@ + o Testing: + - When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool + to produce detailed diagnostic output. Closes ticket 32792.

1 0

[chutney/master] TorNet: Fail bootstrap if times are incorrect
by teor＠torproject.org 16 Mar '20

16 Mar '20

commit 0fe4010bc3c3851239c3dec2800e0ce0899dcdc0 Author: teor <teor(a)torproject.org> Date: Mon Mar 16 15:51:16 2020 +1000 TorNet: Fail bootstrap if times are incorrect If there is a time calculation bug, or a large clock skew, fail bootstrap. Diagnostics for macOS Travis hangs. --- lib/chutney/TorNet.py | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 9857968..efea40e 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2212,6 +2212,7 @@ class Network(object): CHECK_NETWORK_STATUS_DELAY = 1.0 PRINT_NETWORK_STATUS_DELAY = V3_AUTH_VOTING_INTERVAL/2.0 + CHECKS_PER_PRINT = PRINT_NETWORK_STATUS_DELAY / CHECK_NETWORK_STATUS_DELAY def wait_for_bootstrap(self): print("Waiting for nodes to bootstrap...\n") @@ -2225,6 +2226,8 @@ class Network(object): wait_time_list = [c.getUncheckedDirInfoWaitTime() for c in controllers] wait_time = max(wait_time_list) + checks_since_last_print = 0 + most_recent_bootstrap_status = [ None ] * len(controllers) most_recent_desc_status = dict() while True: @@ -2290,12 +2293,46 @@ class Network(object): if now >= limit: break if now >= next_print_status: + if checks_since_last_print <= Network.CHECKS_PER_PRINT/2: + self.print_bootstrap_status(controllers, + most_recent_bootstrap_status, + most_recent_desc_status, + elapsed=elapsed, + msg="Internal timing error") + print("checks_since_last_print: {} (expected: {})" + .format(checks_since_last_print, + Network.CHECKS_PER_PRINT)) + print("start: {} limit: {}".format(start, limit)) + print("next_print_status: {} now: {}" + .format(next_print_status, time.time())) + return False + else: + self.print_bootstrap_status(controllers, + most_recent_bootstrap_status, + most_recent_desc_status, + elapsed=elapsed) + next_print_status = (now + + Network.PRINT_NETWORK_STATUS_DELAY) + checks_since_last_print = 0 + + time.sleep(Network.CHECK_NETWORK_STATUS_DELAY) + + # macOS Travis has some weird hangs, make sure we're not hanging + # in this loop due to clock skew + checks_since_last_print += 1 + if checks_since_last_print >= Network.CHECKS_PER_PRINT*2: self.print_bootstrap_status(controllers, most_recent_bootstrap_status, most_recent_desc_status, - elapsed=elapsed) - next_print_status = now + Network.PRINT_NETWORK_STATUS_DELAY - time.sleep(Network.CHECK_NETWORK_STATUS_DELAY) + elapsed=elapsed, + msg="Internal timing error") + print("checks_since_last_print: {} (expected: {})" + .format(checks_since_last_print, + Network.CHECKS_PER_PRINT)) + print("start: {} limit: {}".format(start, limit)) + print("next_print_status: {} now: {}" + .format(next_print_status, time.time())) + return False self.print_bootstrap_status(controllers, most_recent_bootstrap_status,

1 0