July 2016 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug18902_squashed'
by nickm＠torproject.org 28 Jul '16

28 Jul '16

1 0

[chutney/master] Give test-network.sh a configurable delay before starting or stopping
by teor＠torproject.org 28 Jul '16

28 Jul '16

commit d671658dab35571778572836a62485b95f5f7fc2 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Jul 28 15:24:19 2016 +1000 Give test-network.sh a configurable delay before starting or stopping --start-time is the delay before verifying --bootstrap-time is the delay while verifying before giving up --stop-time is the delay after verifying In general, negative values stop immediately, leaving the network running. (See the README for details.) Implements feature #19764. --- README | 31 +++++++++++++++++------ tools/test-network.sh | 69 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 80 insertions(+), 20 deletions(-) diff --git a/README b/README index a2f9f7c..a8024fa 100644 --- a/README +++ b/README @@ -34,7 +34,12 @@ itself. You can modify its configuration using command-line arguments, or use the chutney environmental variables documented below: - --delay CHUTNEY_BOOTSTRAP_TIME +Timing Options: + --start-time CHUTNEY_START_TIME + --bootstrap-time CHUTNEY_BOOTSTRAP_TIME + --stop-time CHUTNEY_STOP_TIME + +Traffic Options: --data CHUTNEY_DATA_BYTES --connections CHUTNEY_CONNECTIONS --hs-multi-client CHUTNEY_HS_MULTI_CLIENT @@ -81,15 +86,25 @@ HS Connection Tests: # Default behavior is one client connects to each HS ./chutney stop networks/hs-025 -Waiting for the network to bootstrap: +Waiting for the network: - Commands like "chutney verify" start immediately, and keep trying for - CHUTNEY_BOOTSTRAP_TIME seconds. If they haven't been successful after that - time, they fail. + The tools/test-network.sh script waits CHUTNEY_START_TIME seconds + (default: 15) before calling chutney verify, because that's the minimum + amount of time it takes to bootstrap a consensus containing relays. + (It takes 5 seconds for the authorities to create the first consensus, + then 10 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). - The tools/test-network.sh script waits 15 seconds before calling chutney - verify, because that's the minimum amount of time it takes to bootstrap a - consensus containing relays. + Commands like "chutney verify" start immediately, and keep trying for + CHUTNEY_BOOTSTRAP_TIME seconds (default: 60). If it hasn't been + successful after that time, it fails. If CHUTNEY_BOOTSTRAP_TIME is negative, + the script leaves the network running, and exits after CHUTNEY_START_TIME + (without verifying). + + The tools/test-network.sh script waits CHUTNEY_STOP_TIME seconds + after verifying, then exits (default: immediately). If CHUTNEY_STOP_TIME is + negative, the script leaves the network running, and exits after verifying. Changing the network address: diff --git a/tools/test-network.sh b/tools/test-network.sh index 1d4816e..f2069d6 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -32,10 +32,26 @@ do export NETWORK_FLAVOUR="$2" shift ;; - --delay|--sleep|--bootstrap-time|--time) + # The amount of time chutney will wait before starting to verify + # If negative, chutney exits straight after launching the network + --start-time) + export CHUTNEY_START_TIME="$2" + shift + ;; + # The amount of time chutney will try to verify, before failing + # If negative, chutney exits without verifying + --delay|--sleep|--bootstrap-time|--time|--verify-time) + # This isn't the best name for this variable, but we kept it the same + # for backwards compatibility export CHUTNEY_BOOTSTRAP_TIME="$2" shift ;; + # The amount of time chutney will wait after successfully verifying + # If negative, chutney exits without stopping + --stop-time) + export CHUTNEY_STOP_TIME="$2" + shift + ;; # Environmental variables used by chutney verify performance tests # Send this many bytes per client connection (10 KBytes) --data|--data-bytes|--data-byte|--bytes|--byte) @@ -161,15 +177,44 @@ fi cd "$CHUTNEY_PATH" ./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2 -# chutney verify starts immediately, and keeps on trying for 60 seconds -CHUTNEY_BOOTSTRAP_TIME=${CHUTNEY_BOOTSTRAP_TIME:-60} -# but even the fastest tor networks take 5 seconds for their first consensus +# chutney starts verifying after 15 seconds, keeps on trying for 60 seconds, +# and then stops immediately (by default) +# Even the fastest chutney networks take 5 seconds for their first consensus # and then 10 seconds after that for relays to bootstrap and upload descriptors -echo "Waiting 15 seconds for a consensus containing relays to be generated..." -sleep 15 -./chutney verify $CHUTNEY_NETWORK -VERIFY_EXIT_STATUS=$? -# work around a bug/feature in make -j2 (or more) -# where make hangs if any child processes are still alive -./chutney stop $CHUTNEY_NETWORK -exit $VERIFY_EXIT_STATUS +CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-15} +CHUTNEY_BOOTSTRAP_TIME=${CHUTNEY_BOOTSTRAP_TIME:-60} +CHUTNEY_STOP_TIME=${CHUTNEY_STOP_TIME:-0} + +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" +else + echo "Chutney network launched and running. To stop the network, use:" + echo "$PWD/chutney stop $CHUTNEY_NETWORK" + exit 0 +fi + +if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then + # Chutney will try to verify for $CHUTNEY_BOOTSTRAP_TIME seconds + ./chutney verify $CHUTNEY_NETWORK + VERIFY_EXIT_STATUS=$? +else + echo "Chutney network ready and running. To stop the network, use:" + echo "$PWD/chutney stop $CHUTNEY_NETWORK" + exit 0 +fi + +if [ "$CHUTNEY_STOP_TIME" -ge 0 ]; then + if [ "$CHUTNEY_STOP_TIME" -gt 0 ]; then + echo "Waiting ${CHUTNEY_STOP_TIME} seconds before stopping the network..." + fi + sleep "$CHUTNEY_STOP_TIME" + # work around a bug/feature in make -j2 (or more) + # where make hangs if any child processes are still alive + ./chutney stop $CHUTNEY_NETWORK + exit $VERIFY_EXIT_STATUS +else + echo "Chutney network verified and running. To stop the network, use:" + echo "$PWD/chutney stop $CHUTNEY_NETWORK" + exit 0 +fi

1 0

[chutney/master] Wait 5 seconds between data retries
by teor＠torproject.org 28 Jul '16

28 Jul '16

commit 2e665358be47c8e318e61c08b645b6233d77249e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Jul 28 15:43:14 2016 +1000 Wait 5 seconds between data retries This also improves chutney success rates on slow machines. And fix a typo. --- lib/chutney/Traffic.py | 6 +++--- scripts/chutney_tests/verify.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index 881cac7..b5f75fd 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -292,11 +292,11 @@ class Source(Peer): debug("BUG: sent no bytes") self._sent_no_bytes += 1 # We can't retry too fast, otherwise clients burn all their HSDirs - if self._sent_no_bytes >= 3: - print("Send no data %d times. Stalled." % + if self._sent_no_bytes >= 2: + print("Sent no data %d times. Stalled." % (self._sent_no_bytes)) return -1 - time.sleep(3) + time.sleep(5) self.outbuf = self.outbuf[n:] if self.state == self.CONNECTING_THROUGH_PROXY: return 1 # Keep us around. diff --git a/scripts/chutney_tests/verify.py b/scripts/chutney_tests/verify.py index ac601c9..67ca642 100644 --- a/scripts/chutney_tests/verify.py +++ b/scripts/chutney_tests/verify.py @@ -16,7 +16,7 @@ def run_test(network): status = _verify_traffic(network) # Avoid madly spewing output if we fail immediately each time if not status: - time.sleep(2) + time.sleep(5) print("Transmission: %s" % ("Success" if status else "Failure")) if not status: # TODO: allow the debug flag to be passed as an argument to

1 0

[chutney/master] Increase start time to 20 seconds to avoid rare network failures
by teor＠torproject.org 28 Jul '16

28 Jul '16

commit bad7c3e8e4cbb3d276e01b0853eaef39baac8667 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Jul 28 15:39:06 2016 +1000 Increase start time to 20 seconds to avoid rare network failures Older and slower versions of tor can't quite bootstrap in 15 seconds. (At least on slow machines.) --- README | 4 ++-- tools/test-network.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index a8024fa..f720a81 100644 --- a/README +++ b/README @@ -89,9 +89,9 @@ HS Connection Tests: Waiting for the network: The tools/test-network.sh script waits CHUTNEY_START_TIME seconds - (default: 15) before calling chutney verify, because that's the minimum + (default: 20) before calling chutney verify, because that's the minimum amount of time it takes to bootstrap a consensus containing relays. - (It takes 5 seconds for the authorities to create the first consensus, + (It takes 5-10 seconds for the authorities to create the first consensus, then 10 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). diff --git a/tools/test-network.sh b/tools/test-network.sh index 4f1fdbe..0c5fdeb 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -177,11 +177,11 @@ fi cd "$CHUTNEY_PATH" ./tools/bootstrap-network.sh "$NETWORK_FLAVOUR" || exit 2 -# chutney starts verifying after 15 seconds, keeps on trying for 60 seconds, +# chutney starts verifying after 20 seconds, keeps on trying for 60 seconds, # and then stops immediately (by default) -# Even the fastest chutney networks take 5 seconds for their first consensus +# Even the fastest chutney networks take 5-10 seconds for their first consensus # and then 10 seconds after that for relays to bootstrap and upload descriptors -CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-15} +CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-20} CHUTNEY_BOOTSTRAP_TIME=${CHUTNEY_BOOTSTRAP_TIME:-60} CHUTNEY_STOP_TIME=${CHUTNEY_STOP_TIME:-0}

1 0

[chutney/master] Quote some shell variables in test-network.sh
by teor＠torproject.org 28 Jul '16

28 Jul '16

commit 32a809aab74c6d41883b7bb0df1f5ea6404497d9 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Jul 28 15:34:46 2016 +1000 Quote some shell variables in test-network.sh --- tools/test-network.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index f2069d6..4f1fdbe 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -3,7 +3,7 @@ ECHO_N="/bin/echo -n" # Output is prefixed with the name of the script -myname=$(basename $0) +myname=$(basename "$0") until [ -z "$1" ] do @@ -166,7 +166,7 @@ fi # Set the variables for the chutney network flavour export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"} -export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR +export CHUTNEY_NETWORK="networks/$NETWORK_FLAVOUR" # And finish up if we're doing a dry run if [ "$NETWORK_DRY_RUN" = true ]; then @@ -175,7 +175,7 @@ if [ "$NETWORK_DRY_RUN" = true ]; then fi cd "$CHUTNEY_PATH" -./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2 +./tools/bootstrap-network.sh "$NETWORK_FLAVOUR" || exit 2 # chutney starts verifying after 15 seconds, keeps on trying for 60 seconds, # and then stops immediately (by default) @@ -196,8 +196,8 @@ fi if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then # Chutney will try to verify for $CHUTNEY_BOOTSTRAP_TIME seconds - ./chutney verify $CHUTNEY_NETWORK - VERIFY_EXIT_STATUS=$? + ./chutney verify "$CHUTNEY_NETWORK" + VERIFY_EXIT_STATUS="$?" else echo "Chutney network ready and running. To stop the network, use:" echo "$PWD/chutney stop $CHUTNEY_NETWORK" @@ -211,8 +211,8 @@ if [ "$CHUTNEY_STOP_TIME" -ge 0 ]; then sleep "$CHUTNEY_STOP_TIME" # work around a bug/feature in make -j2 (or more) # where make hangs if any child processes are still alive - ./chutney stop $CHUTNEY_NETWORK - exit $VERIFY_EXIT_STATUS + ./chutney stop "$CHUTNEY_NETWORK" + exit "$VERIFY_EXIT_STATUS" else echo "Chutney network verified and running. To stop the network, use:" echo "$PWD/chutney stop $CHUTNEY_NETWORK"

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 27 Jul '16

27 Jul '16

commit 972cecc8569193387309c7d1d0f9002388828341 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 23:48:48 2016 +0000 Update translations for tails-onioncircuits_completed --- pt/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/onioncircuits.pot b/pt/onioncircuits.pot index 74aab60..4ceea5a 100644 --- a/pt/onioncircuits.pot +++ b/pt/onioncircuits.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-07-27 22:54+0000\n" +"PO-Revision-Date: 2016-07-27 23:20+0000\n" "Last-Translator: Sérgio Marques <smarquespt(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 27 Jul '16

27 Jul '16

commit e2b97f31dfe71c22c22c98494e2c633fde1f65a7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 23:48:44 2016 +0000 Update translations for tails-onioncircuits --- pt/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/onioncircuits.pot b/pt/onioncircuits.pot index 74aab60..4ceea5a 100644 --- a/pt/onioncircuits.pot +++ b/pt/onioncircuits.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-07-27 22:54+0000\n" +"PO-Revision-Date: 2016-07-27 23:20+0000\n" "Last-Translator: Sérgio Marques <smarquespt(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 27 Jul '16

27 Jul '16

commit 736728a192430db26b2ef47e585995862807016f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 23:46:18 2016 +0000 Update translations for tails-misc --- pt.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt.po b/pt.po index d1a847d..2cc6462 100644 --- a/pt.po +++ b/pt.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-06-06 14:26+0200\n" -"PO-Revision-Date: 2016-07-27 22:54+0000\n" +"PO-Revision-Date: 2016-07-27 23:18+0000\n" "Last-Translator: Sérgio Marques <smarquespt(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 27 Jul '16

27 Jul '16

commit 96f4857e2fae04a6e46447aae62f702394fd7d34 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 23:19:03 2016 +0000 Update translations for tails-onioncircuits_completed --- pt/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt/onioncircuits.pot b/pt/onioncircuits.pot index 825d683..74aab60 100644 --- a/pt/onioncircuits.pot +++ b/pt/onioncircuits.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-07-20 22:21+0000\n" +"PO-Revision-Date: 2016-07-27 22:54+0000\n" "Last-Translator: Sérgio Marques <smarquespt(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" @@ -84,4 +84,4 @@ msgstr "IP:" #: ../onioncircuits:610 msgid "Bandwidth:" -msgstr "Largura de Banda:" +msgstr "Largura de banda:"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 27 Jul '16

27 Jul '16

commit 1b2fa1c2c75eec6de3df34f7bf6e99fb0fe59b54 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 23:19:00 2016 +0000 Update translations for tails-onioncircuits --- pt/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt/onioncircuits.pot b/pt/onioncircuits.pot index 825d683..74aab60 100644 --- a/pt/onioncircuits.pot +++ b/pt/onioncircuits.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-07-20 22:21+0000\n" +"PO-Revision-Date: 2016-07-27 22:54+0000\n" "Last-Translator: Sérgio Marques <smarquespt(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" @@ -84,4 +84,4 @@ msgstr "IP:" #: ../onioncircuits:610 msgid "Bandwidth:" -msgstr "Largura de Banda:" +msgstr "Largura de banda:"

1 0