Merge pull request #1099 from wiredtiger/evict-in-server

Revert change to not evict in the server thread if application threads wait

1 files changed, 5 insertions, 5 deletions

diff --git a/src/btree/bt_evict.c b/src/btree/bt_evict.c
index de96b2357bc..0f1e1c34ce4 100644
--- a/src/btree/bt_evict.c
+++ b/src/btree/bt_evict.c
@@ -669,14 +669,13 @@ __evict_lru(WT_SESSION_IMPL *session, uint32_t flags)
 
 	/*
 	 * The eviction server thread doesn't do any actual eviction if there
-	 * are eviction workers running or application threads are waiting
-	 * for candidates to evict.
+	 * are eviction workers running.
 	 */
-	if (cache->eviction_workers > 0 ||
-	    __wt_cond_has_waiters(session, cache->evict_waiter_cond)) {
+	WT_RET(__wt_cond_signal(session, cache->evict_waiter_cond));
+
+	if (cache->eviction_workers > 0) {
 		WT_STAT_FAST_CONN_INCR(
 		    session, cache_eviction_server_not_evicting);
-		WT_RET(__wt_cond_signal(session, cache->evict_waiter_cond));
 		/*
 		 * Give other threads a chance to access the queue before
 		 * gathering more candidates.
@@ -686,6 +685,7 @@ __evict_lru(WT_SESSION_IMPL *session, uint32_t flags)
 		WT_STAT_FAST_CONN_INCR(session, cache_eviction_server_evicting);
 		WT_RET(__evict_lru_pages(session, 0));
 	}
+
 	return (0);
 }