From 8772a8a2e8c966d10ff22180633ea4e908734a47 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Mon, 18 Nov 2019 05:14:47 +0000 Subject: Import wiredtiger: d44b1af8a84ef93d9857432c9af5ef3b3adc8bdd from branch mongodb-4.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref: 3a42ced495..d44b1af8a8 for: 4.3.2 WT-4983 Migrate Jenkins “wiredtiger” job to Evergreen WT-4988 Migrate Jenkins “wiredtiger-test-unit” job to Evergreen WT-4989 Migrate Jenkins “wiredtiger-test-unit-long” job to Evergreen WT-4990 Migrate Jenkins “wiredtiger-test-unit-ppc” job to Evergreen WT-4991 Migrate Jenkins “wiredtiger-test-unit-zseries” job to Evergreen WT-5025 Migrate Jenkins “wiredtiger-test-coverage” job to Evergreen WT-5042 Reduce configuration parsing overhead from checkpoints WT-5125 Adding new stats for eviction target strategy WT-5126 Fix incorrect assertion regarding prepared update resolution WT-5136 Fix reading freed memory due to birthmark after uncommitted updates freed WT-5142 Don't create huge root pages when rebalancing or bulk-loading objects with overflow keys WT-5174 Truncation rollback locking is insufficient WT-5181 Preload eatmydata before running evergreen pull request test WT-5193 Revert LAS dropped table change from WT-5150 WT-5196 Data mismatch failures with test/checkpoint after enabling LAS sweep WT-5220 Re-enable LAS dropped table change from WT-5150 WT-5239 Fix syscall failure about metadata file open --- src/third_party/wiredtiger/src/evict/evict_page.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/third_party/wiredtiger/src/evict/evict_page.c') diff --git a/src/third_party/wiredtiger/src/evict/evict_page.c b/src/third_party/wiredtiger/src/evict/evict_page.c index a13526302a2..aa0c248390d 100644 --- a/src/third_party/wiredtiger/src/evict/evict_page.c +++ b/src/third_party/wiredtiger/src/evict/evict_page.c @@ -549,6 +549,8 @@ __evict_review(WT_SESSION_IMPL *session, WT_REF *ref, uint32_t evict_flags, bool */ if (WT_PAGE_IS_INTERNAL(page)) { WT_WITH_PAGE_INDEX(session, ret = __evict_child_check(session, ref)); + if (ret != 0) + WT_STAT_CONN_INCR(session, cache_eviction_fail_active_children_on_an_internal_page); WT_RET(ret); } @@ -683,6 +685,9 @@ __evict_review(WT_SESSION_IMPL *session, WT_REF *ref, uint32_t evict_flags, bool ret = __wt_reconcile(session, ref, NULL, flags, NULL); } + if (ret != 0) + WT_STAT_CONN_INCR(session, cache_eviction_fail_in_reconciliation); + WT_RET(ret); /* -- cgit v1.2.1