summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gorrod <alexander.gorrod@mongodb.com>2015-09-17 09:24:29 +1000
committerMichael Cahill <michael.cahill@mongodb.com>2015-09-17 16:19:05 +1000
commit07dfbfa48cd19b462bb7de08c394ec7e3842dbf9 (patch)
treebabe04e7624be5110f401c943b7a7bc7997e760a
parent3861d0192881e03fc6af98ecf8100d775f9a3d18 (diff)
downloadmongo-07dfbfa48cd19b462bb7de08c394ec7e3842dbf9.tar.gz
SERVER-20159 Make all readers wait while the cache is full.
Merge pull request #2197 from wiredtiger/SERVER-20159 (cherry picked from commit 3b723612cd3273662c0fd2d74603047e0ba99460)
-rw-r--r--src/evict/evict_lru.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/evict/evict_lru.c b/src/evict/evict_lru.c
index ebd13d81403..6876e41d71f 100644
--- a/src/evict/evict_lru.c
+++ b/src/evict/evict_lru.c
@@ -1500,19 +1500,6 @@ __wt_cache_wait(WT_SESSION_IMPL *session, int full)
else if (ret == 0)
continue;
- /*
- * The cache is still full and no pages were found in the queue
- * to evict. If this transaction is the one holding back the
- * oldest ID, we can't wait forever. We'll block next time we
- * are not busy.
- */
- if (busy) {
- __wt_txn_update_oldest(session, 0);
- if (txn_state->id == txn_global->oldest_id ||
- txn_state->snap_min == txn_global->oldest_id)
- return (0);
- }
-
/* Wait for the queue to re-populate before trying again. */
WT_RET(__wt_cond_wait(session,
S2C(session)->cache->evict_waiter_cond, 100000));