October 2018 - tor-commits - lists.torproject.org

[translation/torbutton-torbuttonproperties_completed] Update translations for torbutton-torbuttonproperties_completed
by translation＠torproject.org 28 Oct '18

28 Oct '18

commit 68dc2ddf973be5e303b9e7669fdc992ec432ba18 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 28 09:47:58 2018 +0000 Update translations for torbutton-torbuttonproperties_completed --- ka/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torbutton.properties b/ka/torbutton.properties index 21d96e325..cbe0d8b07 100644 --- a/ka/torbutton.properties +++ b/ka/torbutton.properties @@ -24,7 +24,7 @@ torbutton.popup.dontask = ავტომატურად ჩამოიტ torbutton.popup.no_newnym = Torbutton ვერ ახერხებს ახალი ვინაობის უსაფრთხოდ მონიჭებას. წვდომა არ აქვს წვდომა Tor-ის მართვის პორტთან.\n\nAre you running Tor Browser Bundle? torbutton.security_settings.menu.title = უსაფრთხოების პარამეტრები torbutton.title.prompt_torbrowser = მნიშვნელოვანი ინფორმაცია Torbutton-ის შესახებ -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton ახლა უკვე სხვანაირად მუშაობს: მისი გამორთვა აღარ შეგიძლიათ.\n\nეს ცვლილება იმიტომ გავაკეთეთ, რომ არაა უსაფრთხო Torbutton-ის იმ ბრაუზერში გამოყენება, რომელიც Tor-ის გარეშეც მუშაობს. ამ ყველაფერს უამრავი ხარვეზი ახლავს თან, რომელთა მოგვარებაც სხვა გზით ვერ მოვახერხებთ.\n\nთუ გსურთ განაგრძოთ Firefox-ის ჩვეულებრივ გამოყენება, უნდა ამოშალოთ Torbutton და ჩამოტვირთოთ Tor-ბრაუზერის კრებ ული. პირადი მონაცემების დაცვის შესაძლებლობები გაცილებით უკეთესია Tor-ბრაუზერში, ვიდრე ჩვეულებრივ Firefox-ში, მისი Torbutton-თან ერთად გამოყენების შემთხვევაშიც კი.\n\nTorbutton-ის წასაშლელად, გადადით ხელსაწყოები->დამატებები->გაფართოებები და შემდეგ დააწკაპეთ ამოშლის ღილაკს Torbutton-ის გვერდით. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. torbutton.popup.confirm_plugins = მოდულობს, როგორიცაა Flash შეუძლია საფრთხის ქვეშ დააყენოს თქვენი პირადი მონაცემები და ვინაობის გაუმხელობა.\n\nმათი საშუალებით, შესაძლებელია Tor-ის გვერდის ავლით დადგინდეს თქვენი მდებარეობა და IP-მისამართი.\n\nნამდვილად გსურთ მოდულების ჩართვა?\n\n

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 28 Oct '18

28 Oct '18

commit 09bec955a72e3f57a54bc4be12101c3feb259f74 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 28 09:47:52 2018 +0000 Update translations for torbutton-torbuttonproperties --- ka/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torbutton.properties b/ka/torbutton.properties index 21d96e325..cbe0d8b07 100644 --- a/ka/torbutton.properties +++ b/ka/torbutton.properties @@ -24,7 +24,7 @@ torbutton.popup.dontask = ავტომატურად ჩამოიტ torbutton.popup.no_newnym = Torbutton ვერ ახერხებს ახალი ვინაობის უსაფრთხოდ მონიჭებას. წვდომა არ აქვს წვდომა Tor-ის მართვის პორტთან.\n\nAre you running Tor Browser Bundle? torbutton.security_settings.menu.title = უსაფრთხოების პარამეტრები torbutton.title.prompt_torbrowser = მნიშვნელოვანი ინფორმაცია Torbutton-ის შესახებ -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton ახლა უკვე სხვანაირად მუშაობს: მისი გამორთვა აღარ შეგიძლიათ.\n\nეს ცვლილება იმიტომ გავაკეთეთ, რომ არაა უსაფრთხო Torbutton-ის იმ ბრაუზერში გამოყენება, რომელიც Tor-ის გარეშეც მუშაობს. ამ ყველაფერს უამრავი ხარვეზი ახლავს თან, რომელთა მოგვარებაც სხვა გზით ვერ მოვახერხებთ.\n\nთუ გსურთ განაგრძოთ Firefox-ის ჩვეულებრივ გამოყენება, უნდა ამოშალოთ Torbutton და ჩამოტვირთოთ Tor-ბრაუზერის კრებ ული. პირადი მონაცემების დაცვის შესაძლებლობები გაცილებით უკეთესია Tor-ბრაუზერში, ვიდრე ჩვეულებრივ Firefox-ში, მისი Torbutton-თან ერთად გამოყენების შემთხვევაშიც კი.\n\nTorbutton-ის წასაშლელად, გადადით ხელსაწყოები->დამატებები->გაფართოებები და შემდეგ დააწკაპეთ ამოშლის ღილაკს Torbutton-ის გვერდით. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. torbutton.popup.confirm_plugins = მოდულობს, როგორიცაა Flash შეუძლია საფრთხის ქვეშ დააყენოს თქვენი პირადი მონაცემები და ვინაობის გაუმხელობა.\n\nმათი საშუალებით, შესაძლებელია Tor-ის გვერდის ავლით დადგინდეს თქვენი მდებარეობა და IP-მისამართი.\n\nნამდვილად გსურთ მოდულების ჩართვა?\n\n

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 28 Oct '18

28 Oct '18

commit 84cff8f585b0c7c3d1a8b9813011e1f9e5bb4fb0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 28 09:19:13 2018 +0000 Update translations for support-portal_completed --- contents+zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+zh_CN.po b/contents+zh_CN.po index a0bdffe70..496f81044 100644 --- a/contents+zh_CN.po +++ b/contents+zh_CN.po @@ -3617,7 +3617,7 @@ msgstr "这个选项不会清除任何私密信息或者取消关联你的活动 #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "Install the ntp or openntpd (or similar) package to keep it that way." -msgstr "* 你可以安装 ntp / openntpd （或类似的软件）来确保时间正确。" +msgstr "你可以安装 ntp / openntpd （或类似的软件）来确保时间正确。" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 28 Oct '18

28 Oct '18

commit 9f3c053ad04d733dc9e52bd9cee98ba3ffb8b52c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 28 09:19:06 2018 +0000 Update translations for support-portal --- contents+zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+zh_CN.po b/contents+zh_CN.po index a0bdffe70..496f81044 100644 --- a/contents+zh_CN.po +++ b/contents+zh_CN.po @@ -3617,7 +3617,7 @@ msgstr "这个选项不会清除任何私密信息或者取消关联你的活动 #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) msgid "Install the ntp or openntpd (or similar) package to keep it that way." -msgstr "* 你可以安装 ntp / openntpd （或类似的软件）来确保时间正确。" +msgstr "你可以安装 ntp / openntpd （或类似的软件）来确保时间正确。" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description)

1 0

[sbws/master] Rename key/values in the header
by juga＠torproject.org 28 Oct '18

28 Oct '18

commit c16d966fa3c2d17ecf69b3f2be512a792cb8c8ba Author: juga0 <juga(a)riseup.net> Date: Tue Oct 23 17:38:33 2018 +0000 Rename key/values in the header "measured" could be interpreted as if it was only those relays that were measured, when i means the relays that were measured and pass certain restrictions. "eligible" means the measured relays that would be include in the bandwidth file. --- sbws/lib/v3bwfile.py | 54 ++++++++++++++++++++++------------------- tests/unit/lib/test_v3bwfile.py | 38 +++++++++++++++++------------ 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index c35c865..cd38627 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -28,9 +28,9 @@ KEYVALUE_SEP_V200 = ' ' # List of the extra KeyValues accepted by the class EXTRA_ARG_KEYVALUES = ['software', 'software_version', 'file_created', 'earliest_bandwidth', 'generator_started'] -STATS_KEYVALUES = ['num_measured_relays', 'num_target_relays', - 'num_net_relays', 'perc_measured_relays', - 'perc_measured_targed'] +STATS_KEYVALUES = ['number_eligible_relays', 'minimum_number_eligible_relays', + 'number_consensus_relays', 'percent_eligible_relays', + 'minimum_percent_eligible_relays'] KEYVALUES_INT = STATS_KEYVALUES # List of all unordered KeyValues currently being used to generate the file UNORDERED_KEYVALUES = EXTRA_ARG_KEYVALUES + STATS_KEYVALUES + \ @@ -483,7 +483,8 @@ class V3BWFile(object): log.info('Processing results to generate a bandwidth list file.') header = V3BWHeader.from_results(results, state_fpath) bw_lines_raw = [] - num_net_relays = cls.read_num_net_relays(consensus_path) + number_consensus_relays = cls.read_number_consensus_relays( + consensus_path) state = State(state_fpath) for fp, values in results.items(): # log.debug("Relay fp %s", fp) @@ -494,8 +495,8 @@ class V3BWFile(object): if not bw_lines_raw: log.info("After applying restrictions to the raw results, " "there is not any. Scaling can not be applied.") - cls.update_progress(cls, bw_lines_raw, header, num_net_relays, - state) + cls.update_progress( + cls, bw_lines_raw, header, number_consensus_relays, state) return cls(header, []) if scaling_method == SBWS_SCALING: bw_lines = cls.bw_sbws_scale(bw_lines_raw, scale_constant) @@ -505,7 +506,8 @@ class V3BWFile(object): bw_lines = cls.bw_torflow_scale(bw_lines_raw, torflow_obs, torflow_cap, torflow_round_digs) # log.debug(bw_lines[-1]) - cls.update_progress(cls, bw_lines, header, num_net_relays, state) + cls.update_progress( + cls, bw_lines, header, number_consensus_relays, state) else: bw_lines = cls.bw_kb(bw_lines_raw) # log.debug(bw_lines[-1]) @@ -792,7 +794,7 @@ class V3BWFile(object): return sorted(bw_lines_tf, key=lambda x: x.bw, reverse=reverse) @staticmethod - def read_num_net_relays(consensus_path): + def read_number_consensus_relays(consensus_path): """Read the number of relays in the Network from the cached consensus file.""" num = None @@ -806,7 +808,7 @@ class V3BWFile(object): return num @staticmethod - def measured_progress_stats(bw_lines, num_net_relays, + def measured_progress_stats(bw_lines, number_consensus_relays, min_perc_reached_before): """ Statistics about measurements progress, to be included in the header. @@ -823,34 +825,35 @@ class V3BWFile(object): # network status or descriptors? # It will not be updated to the last consensus, but the list of # measured relays is not either. - assert isinstance(num_net_relays, int) + assert isinstance(number_consensus_relays, int) assert isinstance(bw_lines, list) statsd = {} - statsd['num_measured_relays'] = len(bw_lines) - statsd['num_net_relays'] = num_net_relays - statsd['num_target_relays'] = round(statsd['num_net_relays'] - * MIN_REPORT / 100) - statsd['perc_measured_relays'] = round(len(bw_lines) * 100 - / statsd['num_net_relays']) - statsd['perc_measured_targed'] = MIN_REPORT - if statsd['num_measured_relays'] < statsd['num_target_relays']: + statsd['number_eligible_relays'] = len(bw_lines) + statsd['number_consensus_relays'] = number_consensus_relays + statsd['minimum_number_eligible_relays'] = round( + statsd['number_consensus_relays'] * MIN_REPORT / 100) + statsd['percent_eligible_relays'] = round( + len(bw_lines) * 100 / statsd['number_consensus_relays']) + statsd['minimum_percent_eligible_relays'] = MIN_REPORT + if statsd['number_eligible_relays'] < \ + statsd['minimum_number_eligible_relays']: # if min percent was was reached before, warn # otherwise, debug if min_perc_reached_before is not None: log.warning('The percentage of the measured relays is less ' 'than the %s%% of the relays in the network (%s).', - MIN_REPORT, statsd['num_net_relays']) + MIN_REPORT, statsd['number_consensus_relays']) else: log.info('The percentage of the measured relays is less ' 'than the %s%% of the relays in the network (%s).', - MIN_REPORT, statsd['num_net_relays']) + MIN_REPORT, statsd['number_consensus_relays']) return statsd, False return statsd, True @property def is_min_perc(self): - if getattr(self.header, 'num_measured_relays', 0) \ - < getattr(self.header, 'num_target_relays', 0): + if getattr(self.header, 'number_eligible_relays', 0) \ + < getattr(self.header, 'minimum_number_eligible_relays', 0): return False return True @@ -886,11 +889,12 @@ class V3BWFile(object): ['sum_bw', 'mean_bw', 'median_bw', 'num', 'max_bw', 'min_bw']] - def update_progress(self, bw_lines, header, num_net_relays, state): + def update_progress(self, bw_lines, header, number_consensus_relays, + state): min_perc_reached_before = state.get('min_perc_reached') - if num_net_relays is not None: + if number_consensus_relays is not None: statsd, success = self.measured_progress_stats( - bw_lines, num_net_relays, min_perc_reached_before) + bw_lines, number_consensus_relays, min_perc_reached_before) # add statistics about progress only when there are not enough # measured relays. Should some stats be added always? if not success: diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index 3ced812..35b214d 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -185,11 +185,13 @@ def test_results_away_each_other(datadir): def test_measured_progress_stats(datadir): - num_net_relays = 3 + number_consensus_relays = 3 bw_lines_raw = [] - statsd_exp = {'perc_measured_relays': 100, 'perc_measured_targed': 60, - 'num_net_relays': 3, 'num_target_relays': 2, - 'num_measured_relays': 3} + statsd_exp = {'percent_eligible_relays': 100, + 'minimum_percent_eligible_relays': 60, + 'number_consensus_relays': 3, + 'minimum_number_eligible_relays': 2, + 'number_eligible_relays': 3} min_perc_reached_before = None results = load_result_file(str(datadir.join("results_away.txt"))) for fp, values in results.items(): @@ -201,22 +203,24 @@ def test_measured_progress_stats(datadir): bw_lines = V3BWFile.bw_torflow_scale(bw_lines_raw) assert len(bw_lines) == 3 statsd, success = V3BWFile.measured_progress_stats( - bw_lines, num_net_relays, min_perc_reached_before) + bw_lines, number_consensus_relays, min_perc_reached_before) assert success assert statsd == statsd_exp - num_net_relays = 6 + number_consensus_relays = 6 statsd, success = V3BWFile.measured_progress_stats( - bw_lines, num_net_relays, min_perc_reached_before) + bw_lines, number_consensus_relays, min_perc_reached_before) assert not success - statsd_exp = {'perc_measured_relays': 50, 'perc_measured_targed': 60, - 'num_net_relays': 6, 'num_target_relays': 4, - 'num_measured_relays': 3} + statsd_exp = {'percent_eligible_relays': 50, + 'minimum_percent_eligible_relays': 60, + 'number_consensus_relays': 6, + 'minimum_number_eligible_relays': 4, + 'number_eligible_relays': 3} assert statsd_exp == statsd def test_update_progress(datadir, tmpdir): bw_lines_raw = [] - num_net_relays = 6 + number_consensus_relays = 6 state = {} header = V3BWHeader(str(now_unixts())) results = load_result_file(str(datadir.join("results_away.txt"))) @@ -226,11 +230,13 @@ def test_update_progress(datadir, tmpdir): if line is not None: bw_lines_raw.append(line) bwfile = V3BWFile(header, []) - bwfile.update_progress(bw_lines_raw, header, num_net_relays, state) - assert header.perc_measured_relays == '50' + bwfile.update_progress(bw_lines_raw, header, number_consensus_relays, + state) + assert header.percent_eligible_relays == '50' assert state.get('min_perc_reached') is None - num_net_relays = 3 + number_consensus_relays = 3 header = V3BWHeader(str(now_unixts())) - bwfile.update_progress(bw_lines_raw, header, num_net_relays, state) + bwfile.update_progress(bw_lines_raw, header, number_consensus_relays, + state) assert state.get('min_perc_reached') == now_isodt_str() - assert not hasattr(header, 'perc_measured_relays') + assert not hasattr(header, 'percent_eligible_relays')

1 0

[sbws/master] Add entry about renaming keyvalues
by juga＠torproject.org 28 Oct '18

28 Oct '18

commit 3826e169d51f6c62189c6c064db3af714ff2dad0 Author: juga0 <juga(a)riseup.net> Date: Fri Oct 26 11:44:46 2018 +0000 Add entry about renaming keyvalues --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 148fce4..796ac3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. incorrect (#28041) - Stop removing results that are not away from some other X secs (#28103) - Use secs-away when provided instead of data_period (#28105) +- Rename bandwidth file keyvalues (#28197) ## Added

1 0

[sbws/master] Stop creating unused variable
by juga＠torproject.org 28 Oct '18

28 Oct '18

commit 2bd1e3d9cf2ac24a6308e9e5d5de2ba6fa0bff4f Author: juga0 <juga(a)riseup.net> Date: Fri Oct 26 13:26:08 2018 +0000 Stop creating unused variable So that flake8 version 3.6.0 does not give error --- sbws/util/timestamp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/timestamp.py b/sbws/util/timestamp.py index eca78c5..00f3d1c 100644 --- a/sbws/util/timestamp.py +++ b/sbws/util/timestamp.py @@ -24,7 +24,7 @@ def unixts_to_dt_obj(unixts): if isinstance(unixts, str): try: unixts = int(unixts) - except ValueError as e: + except ValueError: unixts = float(unixts) if isinstance(unixts, float): unixts = int(unixts)

1 0

[sbws/master] Rename bandwidth variables removing "bs"
by juga＠torproject.org 28 Oct '18

28 Oct '18

commit 79693446f53794d3ddab0681333640e3e50da7b0 Author: juga0 <juga(a)riseup.net> Date: Fri Oct 26 10:29:47 2018 +0000 Rename bandwidth variables removing "bs" It was added to know which variables are in Bytes, but it's not clear and it should be the default unit when it's not specified. --- sbws/lib/v3bwfile.py | 62 ++++++++++++++++++++--------------------- tests/unit/lib/test_v3bwfile.py | 6 ++-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index cd38627..ab08810 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -49,8 +49,8 @@ BW_KEYVALUES_BASIC = ['node_id', 'bw'] BW_KEYVALUES_FILE = BW_KEYVALUES_BASIC + \ ['master_key_ed25519', 'nick', 'rtt', 'time', 'success', 'error_stream', 'error_circ', 'error_misc'] -BW_KEYVALUES_EXTRA_BWS = ['bw_bs_median', 'bw_bs_mean', 'desc_avg_bw_bs', - 'desc_obs_bw_bs_last', 'desc_obs_bw_bs_mean'] +BW_KEYVALUES_EXTRA_BWS = ['bw_median', 'bw_mean', 'desc_bw_avg', + 'desc_bw_obs_last', 'desc_bw_obs_mean'] BW_KEYVALUES_EXTRA = BW_KEYVALUES_FILE + BW_KEYVALUES_EXTRA_BWS BW_KEYVALUES_INT = ['bw', 'rtt', 'success', 'error_stream', 'error_circ', 'error_misc'] + BW_KEYVALUES_EXTRA_BWS @@ -271,7 +271,7 @@ class V3BWLine(object): """Convert sbws results to relays' Bandwidth Lines ``bs`` stands for Bytes/seconds - ``bw_bs_mean`` means the bw is obtained from the mean of the all the + ``bw_mean`` means the bw is obtained from the mean of the all the downloads' bandwidth. Downloads' bandwidth are calculated as the amount of data received divided by the the time it took to received. @@ -300,17 +300,17 @@ class V3BWLine(object): results_recent = cls.results_recent_than(results_away, secs_recent) if not results_recent: return None - kwargs['desc_avg_bw_bs'] = \ + kwargs['desc_bw_avg'] = \ results_recent[-1].relay_average_bandwidth kwargs['rtt'] = cls.rtt_from_results(results_recent) - bw = cls.bw_bs_median_from_results(results_recent) - kwargs['bw_bs_mean'] = cls.bw_bs_mean_from_results(results_recent) - kwargs['bw_bs_median'] = cls.bw_bs_median_from_results( + bw = cls.bw_median_from_results(results_recent) + kwargs['bw_mean'] = cls.bw_mean_from_results(results_recent) + kwargs['bw_median'] = cls.bw_median_from_results( results_recent) - kwargs['desc_obs_bw_bs_last'] = \ - cls.desc_obs_bw_bs_last_from_results(results_recent) - kwargs['desc_obs_bw_bs_mean'] = \ - cls.desc_obs_bw_bs_mean_from_results(results_recent) + kwargs['desc_bw_obs_last'] = \ + cls.desc_bw_obs_last_from_results(results_recent) + kwargs['desc_bw_obs_mean'] = \ + cls.desc_bw_obs_mean_from_results(results_recent) bwl = cls(node_id, bw, **kwargs) return bwl return None @@ -363,12 +363,12 @@ class V3BWLine(object): return results_recent @staticmethod - def bw_bs_median_from_results(results): + def bw_median_from_results(results): return max(round(median([dl['amount'] / dl['duration'] for r in results for dl in r.downloads])), 1) @staticmethod - def bw_bs_mean_from_results(results): + def bw_mean_from_results(results): return max(round(mean([dl['amount'] / dl['duration'] for r in results for dl in r.downloads])), 1) @@ -391,17 +391,17 @@ class V3BWLine(object): return rt_dict @staticmethod - def desc_obs_bw_bs_mean_from_results(results): - desc_obs_bws = [] + def desc_bw_obs_mean_from_results(results): + desc_bw_obs_ls = [] for r in results: if r.relay_observed_bandwidth is not None: - desc_obs_bws.append(r.relay_observed_bandwidth) - if desc_obs_bws: - return max(round(mean(desc_obs_bws)), 1) + desc_bw_obs_ls.append(r.relay_observed_bandwidth) + if desc_bw_obs_ls: + return max(round(mean(desc_bw_obs_ls)), 1) return None @staticmethod - def desc_obs_bw_bs_last_from_results(results): + def desc_bw_obs_last_from_results(results): # the last is at the end of the list for r in reversed(results): if r.relay_observed_bandwidth is not None: @@ -573,7 +573,7 @@ class V3BWFile(object): for l in bw_lines_scaled: # min is to limit the bw to descriptor average-bandwidth # max to avoid bandwidth with 0 value - l.bw = max(round(min(l.desc_avg_bw_bs, + l.bw = max(round(min(l.desc_bw_avg, l.bw * scale_constant / m) / 1000), 1) return sorted(bw_lines_scaled, key=lambda x: x.bw, reverse=reverse) @@ -590,7 +590,7 @@ class V3BWFile(object): 'allowed', (1 - accuracy_ratio) * 100, margin * 100) @staticmethod - def bw_torflow_scale(bw_lines, desc_obs_bws=TORFLOW_OBS_MEAN, + def bw_torflow_scale(bw_lines, desc_bw_obs_type=TORFLOW_OBS_MEAN, cap=TORFLOW_BW_MARGIN, num_round_dig=TORFLOW_ROUND_DIG, reverse=False): """ @@ -763,11 +763,11 @@ class V3BWFile(object): log.info("Calculating relays' bandwidth using Torflow method.") bw_lines_tf = copy.deepcopy(bw_lines) # mean (Torflow's strm_avg) - mu = mean([l.bw_bs_mean for l in bw_lines]) + mu = mean([l.bw_mean for l in bw_lines]) # filtered mean (Torflow's filt_avg) - muf = mean([min(l.bw_bs_mean, mu) for l in bw_lines]) + muf = mean([min(l.bw_mean, mu) for l in bw_lines]) # bw sum (Torflow's tot_net_bw or tot_sbw) - sum_bw = sum([l.bw_bs_mean for l in bw_lines]) + sum_bw = sum([l.bw_mean for l in bw_lines]) # Torflow's clipping hlimit = sum_bw * TORFLOW_BW_MARGIN log.debug('sum %s', sum_bw) @@ -775,16 +775,16 @@ class V3BWFile(object): log.debug('muf %s', muf) log.debug('hlimit %s', hlimit) for l in bw_lines_tf: - if desc_obs_bws == TORFLOW_OBS_LAST: - desc_obs_bw = l.desc_obs_bw_bs_last - elif desc_obs_bws == TORFLOW_OBS_MEAN: - desc_obs_bw = l.desc_obs_bw_bs_mean + if desc_bw_obs_type == TORFLOW_OBS_LAST: + desc_bw_obs = l.desc_bw_obs_last + elif desc_bw_obs_type == TORFLOW_OBS_MEAN: + desc_bw_obs = l.desc_bw_obs_mean # just applying the formula above: bw_new = kb_round_x_sig_dig( max( - l.bw_bs_mean / mu, # ratio - min(l.bw_bs_mean, mu) / muf # ratio filtered - ) * desc_obs_bw, \ + l.bw_mean / mu, # ratio + min(l.bw_mean, mu) / muf # ratio filtered + ) * desc_bw_obs, \ digits=num_round_dig) # convert to KB # Cap maximum bw if cap is not None: diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index 35b214d..8e450ca 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -36,9 +36,9 @@ header_extra_ls = [timestamp_l, version_l, software_l, software_version_l, TERMINATOR] header_extra_str = LINE_SEP.join(header_extra_ls) + LINE_SEP -bwl_str = "bw=56 bw_bs_mean=61423 bw_bs_median=55656 "\ - "desc_avg_bw_bs=1000000000 desc_obs_bw_bs_last=524288 "\ - "desc_obs_bw_bs_mean=524288 error_circ=0 error_misc=0 error_stream=1 " \ +bwl_str = "bw=56 bw_mean=61423 bw_median=55656 "\ + "desc_bw_avg=1000000000 desc_bw_obs_last=524288 "\ + "desc_bw_obs_mean=524288 error_circ=0 error_misc=0 error_stream=1 " \ "master_key_ed25519=g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s " \ "nick=A " \ "node_id=$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA rtt=456 success=1 " \

1 0

[sbws/master] Merge branch 'ticket28197_change_keyvalues_names'
by juga＠torproject.org 28 Oct '18

28 Oct '18

commit 4901c66a409e6185ff2c61895f5f0d6778059645 Merge: 5a88f74 2bd1e3d Author: juga0 <juga(a)riseup.net> Date: Sun Oct 28 07:27:24 2018 +0000 Merge branch 'ticket28197_change_keyvalues_names' CHANGELOG.md | 5 +- sbws/lib/v3bwfile.py | 116 +++++++++++++++++++++------------------- sbws/util/timestamp.py | 2 +- tests/unit/lib/test_v3bwfile.py | 44 ++++++++------- 4 files changed, 89 insertions(+), 78 deletions(-) diff --cc CHANGELOG.md index 6c6a008,796ac3d..9e15e01 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -19,14 -18,14 +19,15 @@@ and this project adheres to [Semantic V incorrect (#28041) - Stop removing results that are not away from some other X secs (#28103) - Use secs-away when provided instead of data_period (#28105) +- Disable measuring RTTs (#28159) + - Rename bandwidth file keyvalues (#28197) ## Added - Write bw file only when the percentage of measured relays is bigger than 60% (#28062) --- When the percentage of measured relays is less than the 60%, do not include -- the relays in the bandwidth file and instead include some statistics in the ++- When the percentage of measured relays is less than the 60%, do not include ++ the relays in the bandwidth file and instead include some statistics in the header (#28076) - When the percentage of measured relays is less than the 60% and it was more before, warn about it (#28155) diff --cc sbws/lib/v3bwfile.py index a572625,ab08810..0020c50 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@@ -300,19 -300,17 +300,19 @@@ class V3BWLine(object) results_recent = cls.results_recent_than(results_away, secs_recent) if not results_recent: return None - kwargs['desc_avg_bw_bs'] = \ + kwargs['desc_bw_avg'] = \ results_recent[-1].relay_average_bandwidth - kwargs['rtt'] = cls.rtt_from_results(results_recent) + rtt = cls.rtt_from_results(results_recent) + if rtt: + kwargs['rtt'] = rtt - bw = cls.bw_bs_median_from_results(results_recent) - kwargs['bw_bs_mean'] = cls.bw_bs_mean_from_results(results_recent) - kwargs['bw_bs_median'] = cls.bw_bs_median_from_results( + bw = cls.bw_median_from_results(results_recent) + kwargs['bw_mean'] = cls.bw_mean_from_results(results_recent) + kwargs['bw_median'] = cls.bw_median_from_results( results_recent) - kwargs['desc_obs_bw_bs_last'] = \ - cls.desc_obs_bw_bs_last_from_results(results_recent) - kwargs['desc_obs_bw_bs_mean'] = \ - cls.desc_obs_bw_bs_mean_from_results(results_recent) + kwargs['desc_bw_obs_last'] = \ + cls.desc_bw_obs_last_from_results(results_recent) + kwargs['desc_bw_obs_mean'] = \ + cls.desc_bw_obs_mean_from_results(results_recent) bwl = cls(node_id, bw, **kwargs) return bwl return None

1 0

[sbws/master] Merge branch 'ticket28159_rtts'
by juga＠torproject.org 28 Oct '18

28 Oct '18

commit 5a88f749e15764f08bf5b40b46db2a655d12d2b5 Merge: ed1d61c 4546416 Author: juga0 <juga(a)riseup.net> Date: Sun Oct 28 07:19:38 2018 +0000 Merge branch 'ticket28159_rtts' CHANGELOG.md | 1 + sbws/config.default.ini | 2 +- sbws/lib/resultdump.py | 2 +- sbws/lib/v3bwfile.py | 6 ++++-- sbws/util/config.py | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-)

1 0