- tor-commits - lists.torproject.org

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit 17e3eea68538f81a1375009fa6881ad89e11d5db Merge: 5d41e2223 cc23afddd Author: teor <teor(a)torproject.org> Date: Tue Mar 19 15:43:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5 changes/bug29530_035 | 5 +++++ src/test/test_address.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit b4483edce03be334ac320b812bfeae3bc2d5ee6b Merge: 1547fd99a 17e3eea68 Author: teor <teor(a)torproject.org> Date: Tue Mar 19 15:43:33 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29530_035 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit fcf8c1143b1997e0f3cc00717bfe0846f088f71a Merge: dfb8f0fee b4483edce Author: teor <teor(a)torproject.org> Date: Tue Mar 19 15:43:38 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug29530_035 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/maint-0.3.5] Changes file for backporting 29530 to 0.3.5
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit cc23afddd1d49f3c947020c0c41179a852d9dc7d Author: teor <teor(a)torproject.org> Date: Tue Feb 26 09:58:52 2019 +1000 Changes file for backporting 29530 to 0.3.5 --- changes/bug29530_035 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug29530_035 b/changes/bug29530_035 new file mode 100644 index 000000000..6dfcd51e7 --- /dev/null +++ b/changes/bug29530_035 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - Downgrade some LOG_ERR messages in the address/* tests to warnings. + The LOG_ERR messages were occurring when we had no configured network. + We were failing the unit tests, because we backported 28668 to 0.3.5.8, + but did not backport 29530. Fixes bug 29530; bugfix on 0.3.5.8.

1 0

[tor/maint-0.3.5] Downgrade some LOG_ERR messages in the address/* tests to warnings
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit e138bb8ffc6557a1ba291b9aa6302d7dea85eb65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 14:02:32 2019 -0500 Downgrade some LOG_ERR messages in the address/* tests to warnings Fixes bug 29530, where the LOG_ERR messages were occurring when we had no configured network, and so we were failing the unit tests because of the recently-merged #28668. Commit message edited by teor: We backported 28668 and released it in 0.3.5.8. This commit backports 29530 to 0.3.5. Fixes bug 29530 in Tor 0.3.5.8. --- src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index cfb32b855..c33c30aee 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -744,7 +744,7 @@ test_address_get_if_addrs_list_internal(void *arg) (void)arg; - results = get_interface_address_list(LOG_ERR, 1); + results = get_interface_address_list(LOG_WARN, 1); tt_ptr_op(results, OP_NE, NULL); /* When the network is down, a system might not have any non-local @@ -775,7 +775,7 @@ test_address_get_if_addrs_list_no_internal(void *arg) (void)arg; - results = get_interface_address_list(LOG_ERR, 0); + results = get_interface_address_list(LOG_WARN, 0); tt_ptr_op(results, OP_NE, NULL); /* Work even on systems with only internal IPv4 addresses */ @@ -986,7 +986,7 @@ test_address_get_if_addrs(void *arg) (void)arg; - rv = get_interface_address(LOG_ERR, &addr_h); + rv = get_interface_address(LOG_WARN, &addr_h); /* When the network is down, a system might not have any non-local * non-multicast IPv4 addresses, not even internal ones.

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit 17e3eea68538f81a1375009fa6881ad89e11d5db Merge: 5d41e2223 cc23afddd Author: teor <teor(a)torproject.org> Date: Tue Mar 19 15:43:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5 changes/bug29530_035 | 5 +++++ src/test/test_address.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

[chutney/master] test-network: wait for bootstrap rather than waiting for a set time
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit a113d6a46f63d70f84afa3adc4f3baab2ed414f0 Author: teor <teor(a)torproject.org> Date: Wed Mar 13 13:24:29 2019 +1000 test-network: wait for bootstrap rather than waiting for a set time Chutney uses the new wait_for_bootstrap feature to start verifying after bootstrap is complete. If bootstrap fails, chutney verifies anyway. We'll fail on bootstrap once we implement 20473. Closes 28203. --- README | 23 ++++++++++++++--------- tools/test-network-impl.sh | 5 ++++- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/README b/README index 28f90a0..d2bcfad 100644 --- a/README +++ b/README @@ -150,18 +150,23 @@ Multiple Tests: Waiting for the network: - The tools/test-network.sh script waits CHUTNEY_START_TIME seconds - (default: 40) before calling chutney verify, because that's the minimum + The tools/test-network.sh script waits for all the tor nodes to bootstrap + before calling chutney verify. If CHUTNEY_START_TIME is negative, the + script leaves the network running, and exits immediately (without waiting + for bootstrap, or verifying). + + The wait_for_bootstrap command waits for up to CHUTNEY_START_TIME seconds, + checking whether the logged bootstrapped status for every node is 100%. If + it is, great: it succeeds. If not, it dumps the bootstrap statuses and + exits. test-network.sh does not exit immediately if a tor node fails to + bootstrap. Instead, it attempts to verify. We'll add an option to fail on + tor bootstrap failure in #20473. + + The default CHUTNEY_START_TIME is 40 seconds, because that's the minimum amount of time it takes to bootstrap a consensus containing relays. (It takes 20 seconds for the authorities to create the first consensus, then 20 seconds for relays to bootstrap, submit their descriptors, and be - included in the next consensus.) If CHUTNEY_START_TIME is negative, the - script leaves the network running, and exits immediately (without verifying). - - chutney also has an experimental wait_for_bootstrap command. It waits for - up to CHUTNEY_START_TIME seconds, checking whether the logged bootstrapped - status for every node is 100%. If it is, great: it succeeds. If not, it - dumps the bootstrap statuses and exits. + included in the next consensus.) Commands like "chutney verify" start immediately, and keep trying for CHUTNEY_BOOTSTRAP_TIME seconds (default: 60). If it hasn't been diff --git a/tools/test-network-impl.sh b/tools/test-network-impl.sh index 2de1bfa..ca086df 100755 --- a/tools/test-network-impl.sh +++ b/tools/test-network-impl.sh @@ -20,7 +20,10 @@ CHUTNEY="$CHUTNEY_PATH/chutney" if [ "$CHUTNEY_START_TIME" -ge 0 ]; then $ECHO "Waiting $CHUTNEY_START_TIME seconds for a consensus containing relays to be generated..." - sleep "$CHUTNEY_START_TIME" + # We log bootstrap status for debugging purposes. + # We'll fix bootstrap errors in #20473. + "$CHUTNEY" wait_for_bootstrap "$CHUTNEY_NETWORK" \ + || $ECHO "Tor bootstrap failed, ignoring for now." else $ECHO "Chutney network launched and running. To stop the network, use:" $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK"

1 0

[chutney/master] wait_for_bootstrap: When logging un-bootstrapped nodes, also log crashes
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit ee396986d85df7cd736159d9031857573499877e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 13 10:17:58 2019 -0400 wait_for_bootstrap: When logging un-bootstrapped nodes, also log crashes Previously, if you said wait_for_bootstrap, it would tell you if a node wasn't bootstrapped, but wouldn't help you notice whether it was crashed or running. --- lib/chutney/TorNet.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index e22afea..7269a00 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1199,6 +1199,7 @@ class Network(object): print("Bootstrap failed. Node status:") for c in controllers: + c.check(listRunning=False, listNonRunning=True) print(c.getLastBootstrapStatus()) return False

1 0

[chutney/master] wait_for_bootstrap: Fix the regex for bootstrap messages
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit bd76a94b69c46e566c6d0517dd7b829f04191c6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 13 10:14:29 2019 -0400 wait_for_bootstrap: Fix the regex for bootstrap messages The regex was almost right, but it required a space after the percent symbol. In reality, this space should only be there when there is a keyword following. Part of 22132. --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 4415907..e22afea 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -837,7 +837,7 @@ class LocalNodeController(NodeController): percent,keyword,message=-100,"no_message","No bootstrap messages yet." with open(logfname, 'r') as f: for line in f: - m = re.search(r'Bootstrapped (\d+)% ($[^$]*\))?: (.*)', line) + m = re.search(r'Bootstrapped (\d+)%( $[^$]*\))?: (.*)', line) if m: percent, keyword, message = m.groups() percent = int(percent)

1 0

[chutney/master] wait_for_bootstrap: log node names with bootstrap statuses
by teor＠torproject.org 19 Mar '19

19 Mar '19

commit 18af751e0b86c00368230905208f6b4b6646e4a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 13 10:24:15 2019 -0400 wait_for_bootstrap: log node names with bootstrap statuses --- lib/chutney/TorNet.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 7269a00..3e8b94e 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -647,6 +647,10 @@ class LocalNodeController(NodeController): NodeController.__init__(self, env) self._env = env + def getNick(self): + """Return the nickname for this node.""" + return self._env['nick'] + def getPid(self): """Assuming that this node has its pidfile in ${dir}/pid, return the pid of the running process, or None if there is no pid in the @@ -1200,7 +1204,7 @@ class Network(object): print("Bootstrap failed. Node status:") for c in controllers: c.check(listRunning=False, listNonRunning=True) - print(c.getLastBootstrapStatus()) + print("{}: {}".format(c.getNick(), c.getLastBootstrapStatus())) return False

1 0