Skip to content

Commit

Permalink
WT-2425: Revert "WT-2173: test/format cache stuck full"
Browse files Browse the repository at this point in the history
This reverts commit db58fef.
  • Loading branch information
keithbostic committed Feb 24, 2016
1 parent 7fb05a7 commit 585cbf8
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions src/evict/evict_lru.c
Expand Up @@ -1369,12 +1369,10 @@ __evict_get_ref(
WT_SESSION_IMPL *session, bool is_server, WT_BTREE **btreep, WT_REF **refp)
{
WT_CACHE *cache;
WT_CONNECTION_IMPL *conn;
WT_EVICT_ENTRY *evict;
uint32_t candidates;

conn = S2C(session);
cache = conn->cache;
cache = S2C(session)->cache;
*btreep = NULL;
*refp = NULL;

Expand All @@ -1394,14 +1392,11 @@ __evict_get_ref(
}

/*
* The eviction server normally only tries to evict half of the pages
* before looking for more, unless there isn't anybody else to do the
* work, we're stuck, or there's only a single candidate (that happens
* in very small environments).
* The eviction server only tries to evict half of the pages before
* looking for more.
*/
candidates = cache->evict_candidates;
if (is_server && conn->evict_workers_max != 0 &&
!F_ISSET(cache, WT_CACHE_STUCK) && candidates > 1)
if (is_server && candidates > 1)
candidates /= 2;

/* Get the next page queued for eviction. */
Expand Down

0 comments on commit 585cbf8

Please sign in to comment.