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

[sbws/master] Update the total
by pastly＠torproject.org 05 Sep '18

05 Sep '18

commit a602a54e12f200566751e417ed6614a8900aead2 Author: juga0 <juga(a)riseup.net> Date: Fri Aug 3 12:53:39 2018 +0000 Update the total and add comment about MiB --- sbws/util/fs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sbws/util/fs.py b/sbws/util/fs.py index 111e109..5b48f3b 100644 --- a/sbws/util/fs.py +++ b/sbws/util/fs.py @@ -31,7 +31,9 @@ def sbws_required_disk_space(conf): # roughly, size of a current tor dir space_tor_dir = 19828000 # duplicate everything to warn early - size_total = (space_v3bw_files + size_log_file + space_result_files) * 2 + size_total = (space_v3bw_files + size_log_file + space_result_files + + space_tor_dir) * 2 + # convert to MiB size_total_mb = round(size_total / (1024 ** 2)) return size_total_mb

1 0

[sbws/master] Add changelog entry about disk space warning
by pastly＠torproject.org 05 Sep '18

05 Sep '18

commit 1cc6e19d484980f9057cd2c099df4bafe7ae46d7 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 25 23:05:31 2018 +0000 Add changelog entry about disk space warning --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1de8368..5f028b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ file) - Log line on start up with sbws version, platform info, and library versions (trac#26751) - Manual pages (#26926) +- Warn when there is not enough disk space (#26937) ### Fixed

1 0

[sbws/master] Increase space needed in test
by pastly＠torproject.org 05 Sep '18

05 Sep '18

commit ec42ff0376dfe99820c9dd290e402bea2fb3aaa0 Author: juga0 <juga(a)riseup.net> Date: Fri Aug 3 12:54:48 2018 +0000 Increase space needed in test --- tests/unit/util/test_fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/util/test_fs.py b/tests/unit/util/test_fs.py index 0f4c35a..e659d83 100644 --- a/tests/unit/util/test_fs.py +++ b/tests/unit/util/test_fs.py @@ -9,7 +9,7 @@ def mock_df_zero(path): def mock_df_enough(path): - return 32 + return 89 @patch('sbws.util.fs.df', mock_df_zero)

1 0

[sbws/master] Revert "Warn when exception might be caused by no disk space"
by pastly＠torproject.org 05 Sep '18

05 Sep '18

commit 1da39db2bb46536fa3ef9227f249620859c18b6f Author: juga0 <juga(a)riseup.net> Date: Sat Aug 4 05:17:29 2018 +0000 Revert "Warn when exception might be caused by no disk space" This reverts commit 72b45d4d5b5ccd7228ab793012ba7d42084ddfbf. --- sbws/lib/circuitbuilder.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index 66687b0..e3b3950 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -65,9 +65,7 @@ class CircuitBuilder: pass self.built_circuits.discard(circ_id) except (ControllerError, ValueError) as e: - log.warning("Error trying to get circuit to close it: %s.", e, - "If sbws didn't receive SIGHUP, " - "maybe this system run out of disk space.") + log.exception("Error trying to get circuit to close it: %s.", e) def _build_circuit_impl(self, path): if not valid_circuit_length(path):

1 0

[sbws/master] Fix typo
by pastly＠torproject.org 05 Sep '18

05 Sep '18

commit 39cf07040a3e36fcde07b58d9faf982d1a5613af Author: juga0 <juga(a)riseup.net> Date: Fri Aug 3 12:54:26 2018 +0000 Fix typo --- sbws/util/fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/fs.py b/sbws/util/fs.py index 0f20d0a..9e6bc29 100644 --- a/sbws/util/fs.py +++ b/sbws/util/fs.py @@ -51,7 +51,7 @@ def is_low_space(conf): disk_avail_mb = df(conf['paths']['sbws_home']) if disk_avail_mb < disk_required_mb: log.warn("The space left on the device (%s MiB) is less than " - "the minimum recommented to run sbws (%s MiB)." + "the minimum recommended to run sbws (%s MiB)." "Run sbws cleanup to delete old sbws generated files.", disk_avail_mb, disk_required_mb) return True

1 0

[sbws/master] Revert "Exit on OSError when building circuit"
by pastly＠torproject.org 05 Sep '18

05 Sep '18

commit c1a6eb9d21d340e23d725dbb73c3ac52f9c940cb Author: juga0 <juga(a)riseup.net> Date: Sat Aug 4 05:17:53 2018 +0000 Revert "Exit on OSError when building circuit" This reverts commit ede9feda3b6285c9e04a162dc393afa5e734d7e3. An exception trying to write to log file when there is not disk space can happen anywhere in the code --- sbws/core/scanner.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 8b13816..fa8cc88 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -201,16 +201,7 @@ def measure_relay(args, conf, destinations, cb, rl, relay): our_nick = conf['scanner']['nickname'] circ_id = cb.build_circuit(circ_fps) if not circ_id: - try: - log.warning('Could not build circuit involving %s', relay.nickname) - except OSError as e: - # if the error is no space left (logging to file system) - # can not log the error, so print it - # this can happen in any log call, here would happen when measuring - # new relay starts - if e.code == 28: # No space left on device - print("ERROR: " + str(e)) - exit(1) + log.warning('Could not build circuit involving %s', relay.nickname) msg = 'Unable to complete circuit' return [ ResultErrorCircuit(relay, circ_fps, dest.url, our_nick, msg=msg),

1 0

[sbws/master] Size of log file, no stdout
by pastly＠torproject.org 05 Sep '18

05 Sep '18

commit dcc7435aae0d15bbad89aa21161b106cc64388c2 Author: juga0 <juga(a)riseup.net> Date: Sat Aug 4 05:13:04 2018 +0000 Size of log file, no stdout --- sbws/util/fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/fs.py b/sbws/util/fs.py index 9e6bc29..9621b6f 100644 --- a/sbws/util/fs.py +++ b/sbws/util/fs.py @@ -27,7 +27,7 @@ def sbws_required_disk_space(conf): # not counted rotated files and assuming that when it is not rotated the # size will be aproximately 10MiB size_log_file = conf.getint('logging', 'to_file_max_bytes') or 10485760 \ - if conf.getboolean('logging', 'to_stdout') else 0 + if conf.getboolean('logging', 'to_file') else 0 # roughly, size of a current tor dir space_tor_dir = 19828000 # duplicate everything to warn early

1 0

[sbws/master] Use conf.getint and getpath
by pastly＠torproject.org 05 Sep '18

05 Sep '18

commit 93e454e2328f2ed427d844c72bcc74cafd34ec52 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Sep 5 10:56:31 2018 -0400 Use conf.getint and getpath getpath is necessary so that ~ is expanded GH: closes #241 trac: implements #26937 --- sbws/util/fs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/util/fs.py b/sbws/util/fs.py index 9621b6f..c7a5de7 100644 --- a/sbws/util/fs.py +++ b/sbws/util/fs.py @@ -20,7 +20,7 @@ def sbws_required_disk_space(conf): # ~1000 is the length of a line when the result is successfull # ~4550 is the number of lines of the biggest result file size_result_file = 4550 * 1000 - num_result_files = int(conf['general']['data_period']) + num_result_files = conf.getint('general', 'data_period') # not counting compressed files space_v3bw_files = size_v3bw_file * num_v3bw_files space_result_files = size_result_file * num_result_files @@ -48,7 +48,7 @@ def is_low_space(conf): what is needed for sbws and False otherwise needs. """ disk_required_mb = sbws_required_disk_space(conf) - disk_avail_mb = df(conf['paths']['sbws_home']) + disk_avail_mb = df(conf.getpath('paths', 'sbws_home')) if disk_avail_mb < disk_required_mb: log.warn("The space left on the device (%s MiB) is less than " "the minimum recommended to run sbws (%s MiB)."

1 0

[sbws/master] Add changelog entry about system physical requirements
by pastly＠torproject.org 05 Sep '18

05 Sep '18

commit b329a56e4e741839e6a25dbd913f7b7853c64562 Author: juga0 <juga(a)riseup.net> Date: Mon Sep 3 12:45:45 2018 +0000 Add changelog entry about system physical requirements --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f028b6..37b79f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Added + +- Add system physical requirements, but do not warn (which requires to make + syscalls). (#26937) + ### Fixed - Broken environment variable in default sbws config. To use envvar $FOO, write

1 0

[sbws/master] Move changelog entry to Unreleased
by pastly＠torproject.org 05 Sep '18

05 Sep '18

commit a9e4fbdfcee8f39b3694aee79b17361605029e69 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Sep 5 11:11:45 2018 -0400 Move changelog entry to Unreleased --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27795be..5d0acce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - Add system physical requirements section to INSTALL (#26937) +- Warn when there is not enough disk space (#26937) ### Fixed @@ -43,7 +44,6 @@ file) - Log line on start up with sbws version, platform info, and library versions (trac#26751) - Manual pages (#26926) -- Warn when there is not enough disk space (#26937) ### Fixed

1 0