summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@mongodb.com>2015-12-02 12:35:39 +1100
committerMichael Cahill <michael.cahill@mongodb.com>2015-12-02 12:35:39 +1100
commit6c82703fd06d34a4daa8a5e4be0e1250108a1e27 (patch)
tree7f627b37ac7989c132cb9bf08cc7bffd315bd9ab /src
parent5ebfd9211956d794795c0be293c76e8dd22d3f4d (diff)
parent4fc3e3982eb92273d68a70ad3a09a7f6ad27364f (diff)
downloadmongo-6c82703fd06d34a4daa8a5e4be0e1250108a1e27.tar.gz
Merge branch 'develop' into SERVER-21553-free-deleted-blocks
Diffstat (limited to 'src')
-rw-r--r--src/evict/evict_lru.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/evict/evict_lru.c b/src/evict/evict_lru.c
index f2784890ab7..4ec59853b7e 100644
--- a/src/evict/evict_lru.c
+++ b/src/evict/evict_lru.c
@@ -1247,6 +1247,7 @@ __evict_walk_file(WT_SESSION_IMPL *session, u_int *slotp)
* eviction, skip anything that isn't marked.
*/
if (FLD_ISSET(cache->state, WT_EVICT_PASS_WOULD_BLOCK) &&
+ page->memory_footprint < btree->splitmempage &&
page->read_gen != WT_READGEN_OLDEST)
continue;