diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-29 13:03:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-29 13:03:36 -0400 |
| commit | da159c45e2447c729601a1393e93de908ba27c16 (patch) | |
| tree | 8c3e518856fff0645bd858d7e227b418c94915a4 /src/or/consdiffmgr.c | |
| parent | 5e97b34daa27f6e0ca1c233e31d00ab8620284f0 (diff) | |
| download | tor-da159c45e2447c729601a1393e93de908ba27c16.tar.gz tor-da159c45e2447c729601a1393e93de908ba27c16.zip | |
On windows, allow many entries in conscache directories
Since we can't be sure that we can unlink enough files on windows
here, let's let the number of permitted entries grow huge if it
really must.
We do this by letting the storagedir hold lots of entries, but still
trying to keep the number of entries under the configured limit. We
also have to tell consdiffmgr not to freak out if it can't actually
remove enough entries.
Part of a fix for bug 22752
Diffstat (limited to 'src/or/consdiffmgr.c')
| -rw-r--r-- | src/or/consdiffmgr.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 928fc26f54..831d5d45c3 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1136,7 +1136,7 @@ consdiffmgr_ensure_space_for_files(int n) return 0; } // Let's get more assertive: clean out unused stuff, and force-remove - // the files. + // the files that we can. consdiffmgr_cleanup(); consensus_cache_delete_pending(cache, 1); const int n_to_remove = n - consensus_cache_get_n_filenames_available(cache); @@ -1159,6 +1159,14 @@ consdiffmgr_ensure_space_for_files(int n) smartlist_free(objects); consensus_cache_delete_pending(cache, 1); + + if (consensus_cache_may_overallocate(cache)) { + /* If we're allowed to throw extra files into the cache, let's do so + * rather getting upset. + */ + return 0; + } + if (BUG(n_marked < n_to_remove)) return -1; else |