summaryrefslogtreecommitdiff
path: root/src/txn/txn_ckpt.c
diff options
context:
space:
mode:
authorAlex Gorrod <alexander.gorrod@mongodb.com>2016-09-26 17:05:01 +1000
committerAlex Gorrod <alexander.gorrod@mongodb.com>2016-09-26 17:05:01 +1000
commitfc0e7abe82595e579573d42448632f7b36a2d154 (patch)
treeb5a19458b0a49252b4231f1660fc63553b439268 /src/txn/txn_ckpt.c
parent5bc03723a7e77c96b1d5e45a97173654872c727a (diff)
parent5fb852354745b9efe638183084ee00db821aa132 (diff)
downloadmongo-fc0e7abe82595e579573d42448632f7b36a2d154.tar.gz
Merge branch 'develop' into mongodb-3.4mongodb-3.4.0-rc0mongodb-3.3.15
Diffstat (limited to 'src/txn/txn_ckpt.c')
-rw-r--r--src/txn/txn_ckpt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/txn/txn_ckpt.c b/src/txn/txn_ckpt.c
index 180a06a3aed..3aad95f5a9f 100644
--- a/src/txn/txn_ckpt.c
+++ b/src/txn/txn_ckpt.c
@@ -423,7 +423,8 @@ __checkpoint_reduce_dirty_cache(WT_SESSION_IMPL *session)
* level.
*/
__wt_sleep(0, 10 * stepdown_us);
- cache->eviction_scrub_limit = current_dirty - delta;
+ cache->eviction_scrub_limit =
+ WT_MAX(cache->eviction_dirty_target, current_dirty - delta);
WT_STAT_CONN_SET(session, txn_checkpoint_scrub_target,
cache->eviction_scrub_limit);
WT_RET(__wt_epoch(session, &last));