summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@wiredtiger.com>2014-12-22 12:40:08 +1100
committerMichael Cahill <michael.cahill@wiredtiger.com>2014-12-22 12:40:08 +1100
commit01818b70ac4df0c54afd08f5721f0ffc1d90e2d5 (patch)
tree31e2d5925cdcfff13ec75d18393f9929cccb2e42 /src/include
parent42a5beaba747023f0b6b96651a83ab4b4543d520 (diff)
downloadmongo-01818b70ac4df0c54afd08f5721f0ffc1d90e2d5.tar.gz
Only trigger the eviction server to look for pages that would force eviction if regular eviction either fails or does an in-memory split.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/btree.i6
-rw-r--r--src/include/cursor.i2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/include/btree.i b/src/include/btree.i
index d2198a1462d..6c42155fefb 100644
--- a/src/include/btree.i
+++ b/src/include/btree.i
@@ -227,13 +227,9 @@ __wt_cache_bytes_inuse(WT_CACHE *cache)
* Set a page to be evicted as soon as possible.
*/
static inline void
-__wt_page_evict_soon(WT_SESSION_IMPL *session, WT_PAGE *page)
+__wt_page_evict_soon(WT_PAGE *page)
{
page->read_gen = WT_READGEN_OLDEST;
- if (!F_ISSET(S2C(session)->cache, WT_EVICT_EARLY_CANDIDATES)) {
- F_SET(S2C(session)->cache, WT_EVICT_EARLY_CANDIDATES);
- (void)__wt_evict_server_wake(session);
- }
}
/*
diff --git a/src/include/cursor.i b/src/include/cursor.i
index d56f65db0a6..737ac8dcdba 100644
--- a/src/include/cursor.i
+++ b/src/include/cursor.i
@@ -122,7 +122,7 @@ __curfile_leave(WT_CURSOR_BTREE *cbt)
*/
if (cbt->ref != NULL &&
cbt->page_deleted_count > WT_BTREE_DELETE_THRESHOLD)
- __wt_page_evict_soon(session, cbt->ref->page);
+ __wt_page_evict_soon(cbt->ref->page);
cbt->page_deleted_count = 0;
/*