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

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit cb90defba6f16ac96578a6b88c2c3d384a7748ee Merge: e81896add 86e6cb640 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/consdiffmgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 8b162443b91b12e876d94282f1d5d6e0d519cb95 Merge: 69e242f84 cb90defba Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.2' src/or/consdiffmgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] add a rate-limit.
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 86e6cb640942de251e601b43a8afad45c4761268 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 10:01:10 2018 -0500 add a rate-limit. --- src/or/consdiffmgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index e2bb31e52..18aa9c2c0 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1311,8 +1311,10 @@ store_multiple(consensus_cache_entry_handle_t **handles_out, body_out, bodylen_out); if (ent == NULL) { - log_warn(LD_FS, "Unable to store object %s compressed with %s.", - description, methodname); + static ratelim_t cant_store_ratelim = RATELIM_INIT(5*70); + log_fn_ratelim(&cant_store_ratelim, LOG_WARN, LD_FS, + "Unable to store object %s compressed with %s.", + description, methodname); continue; }

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit d83d1c7a890eea5dca8c9db9c8b9b75ad2fa8f1a Merge: 76b73013e 86e6cb640 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 src/or/consdiffmgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] add a rate-limit.
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 86e6cb640942de251e601b43a8afad45c4761268 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 10:01:10 2018 -0500 add a rate-limit. --- src/or/consdiffmgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index e2bb31e52..18aa9c2c0 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1311,8 +1311,10 @@ store_multiple(consensus_cache_entry_handle_t **handles_out, body_out, bodylen_out); if (ent == NULL) { - log_warn(LD_FS, "Unable to store object %s compressed with %s.", - description, methodname); + static ratelim_t cant_store_ratelim = RATELIM_INIT(5*70); + log_fn_ratelim(&cant_store_ratelim, LOG_WARN, LD_FS, + "Unable to store object %s compressed with %s.", + description, methodname); continue; }

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit da2daa8e5e6149b81a3c859db3be6409956c8857 Merge: 3d7f134be cb90defba Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/consdiffmgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.1] If out-of-disk when saving a consensus cache entry, don't BUG.
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 9c2bc441f8acf6fb47c7cc1f09c04974ee35d694 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 26 13:14:14 2018 -0500 If out-of-disk when saving a consensus cache entry, don't BUG. Just warn instead. Fixes bug 24859. --- changes/bug24859 | 4 ++++ src/or/consdiffmgr.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24859 b/changes/bug24859 new file mode 100644 index 000000000..122109d65 --- /dev/null +++ b/changes/bug24859 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Don't treat inability to store a cached consensus object as a + bug: it can happen normally when we are out of disk space. + Fixes bug 24859; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index c5f55b6f3..e2bb31e52 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1310,8 +1310,11 @@ store_multiple(consensus_cache_entry_handle_t **handles_out, labels, body_out, bodylen_out); - if (BUG(ent == NULL)) + if (ent == NULL) { + log_warn(LD_FS, "Unable to store object %s compressed with %s.", + description, methodname); continue; + } status = CDM_DIFF_PRESENT; handles_out[i] = consensus_cache_entry_handle_new(ent);

1 0

[tor/master] If out-of-disk when saving a consensus cache entry, don't BUG.
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 9c2bc441f8acf6fb47c7cc1f09c04974ee35d694 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 26 13:14:14 2018 -0500 If out-of-disk when saving a consensus cache entry, don't BUG. Just warn instead. Fixes bug 24859. --- changes/bug24859 | 4 ++++ src/or/consdiffmgr.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24859 b/changes/bug24859 new file mode 100644 index 000000000..122109d65 --- /dev/null +++ b/changes/bug24859 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Don't treat inability to store a cached consensus object as a + bug: it can happen normally when we are out of disk space. + Fixes bug 24859; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index c5f55b6f3..e2bb31e52 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1310,8 +1310,11 @@ store_multiple(consensus_cache_entry_handle_t **handles_out, labels, body_out, bodylen_out); - if (BUG(ent == NULL)) + if (ent == NULL) { + log_warn(LD_FS, "Unable to store object %s compressed with %s.", + description, methodname); continue; + } status = CDM_DIFF_PRESENT; handles_out[i] = consensus_cache_entry_handle_new(ent);

1 0

[tor/maint-0.3.2] If out-of-disk when saving a consensus cache entry, don't BUG.
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 9c2bc441f8acf6fb47c7cc1f09c04974ee35d694 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 26 13:14:14 2018 -0500 If out-of-disk when saving a consensus cache entry, don't BUG. Just warn instead. Fixes bug 24859. --- changes/bug24859 | 4 ++++ src/or/consdiffmgr.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24859 b/changes/bug24859 new file mode 100644 index 000000000..122109d65 --- /dev/null +++ b/changes/bug24859 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Don't treat inability to store a cached consensus object as a + bug: it can happen normally when we are out of disk space. + Fixes bug 24859; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index c5f55b6f3..e2bb31e52 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1310,8 +1310,11 @@ store_multiple(consensus_cache_entry_handle_t **handles_out, labels, body_out, bodylen_out); - if (BUG(ent == NULL)) + if (ent == NULL) { + log_warn(LD_FS, "Unable to store object %s compressed with %s.", + description, methodname); continue; + } status = CDM_DIFF_PRESENT; handles_out[i] = consensus_cache_entry_handle_new(ent);

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit e81896adda197b705958bcbe2b9d2c5db839b8a5 Merge: ee5c624be 9c2bc441f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24859 | 4 ++++ src/or/consdiffmgr.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0