diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2021-05-04 09:58:25 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-04 00:52:35 +0000 |
| commit | 7d979514eff586d39f090524fe323fb6fe38c791 (patch) | |
| tree | 06b2e4d9e736a97386db069a24028058a455949f | |
| parent | 08a480f7f361fa839ad020da7aa1df77cb6f5cb1 (diff) | |
| download | mongo-7d979514eff586d39f090524fe323fb6fe38c791.tar.gz | |
Import wiredtiger: 1a7a783ee4a4c00be029dd58200767d15b8fda00 from branch mongodb-5.0
ref: a72a967a29..1a7a783ee4
for: 5.0.0
WT-7458 Coverity analysis defect 119949: Redundant test
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/evict/evict_page.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index e0db34f50c1..39745950f49 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-5.0", - "commit": "a72a967a296068ef9feda3a3e3ad4b63389e8956" + "commit": "1a7a783ee4a4c00be029dd58200767d15b8fda00" } diff --git a/src/third_party/wiredtiger/src/evict/evict_page.c b/src/third_party/wiredtiger/src/evict/evict_page.c index 3c881cdb78c..26b38dc5996 100644 --- a/src/third_party/wiredtiger/src/evict/evict_page.c +++ b/src/third_party/wiredtiger/src/evict/evict_page.c @@ -584,7 +584,7 @@ __evict_review(WT_SESSION_IMPL *session, WT_REF *ref, uint32_t evict_flags, bool * while checkpoint is operating on the HS file, we can end up in a situation where we exceed * the cache size limits. */ - if (modified && conn->txn_global.checkpoint_running_hs && !WT_IS_HS(btree->dhandle) && + if (conn->txn_global.checkpoint_running_hs && !WT_IS_HS(btree->dhandle) && __wt_cache_hs_dirty(session) && __wt_cache_full(session)) { WT_STAT_CONN_INCR(session, cache_eviction_blocked_checkpoint_hs); return (__wt_set_return(session, EBUSY)); |