diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-02-15 08:33:56 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-14 22:27:59 +0000 |
| commit | 5315153835700fcb583c65e0e940ffe5362c6782 (patch) | |
| tree | 5970ba044c120723181bf28c8a58b41d0fee641f | |
| parent | 2bdfdc5a73ec0e93cfde7580b53ed53d1597805b (diff) | |
| download | mongo-5315153835700fcb583c65e0e940ffe5362c6782.tar.gz | |
Import wiredtiger: eb843ba7b05282697f4f0d85bebfcb7fbb7ca724 from branch mongodb-master
ref: ade1582595..eb843ba7b0
for: 5.3.0
WT-8829 Use the new durability test
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/txn/txn_ckpt.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 a6a0f2ce9a7..4c5102fd2e7 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-master", - "commit": "ade1582595da39251d33ea8acd397dbabc4047ad" + "commit": "eb843ba7b05282697f4f0d85bebfcb7fbb7ca724" } diff --git a/src/third_party/wiredtiger/src/txn/txn_ckpt.c b/src/third_party/wiredtiger/src/txn/txn_ckpt.c index d36fafda702..4cd36ebee0c 100644 --- a/src/third_party/wiredtiger/src/txn/txn_ckpt.c +++ b/src/third_party/wiredtiger/src/txn/txn_ckpt.c @@ -2102,7 +2102,7 @@ __wt_checkpoint_close(WT_SESSION_IMPL *session, bool final) * is a stable timestamp set or the connection is configured to disallow such operation. * Flushing trees can lead to files that are inconsistent on disk after a crash. */ - if (btree->modified && !bulk && !__wt_btree_immediately_durable(session) && + if (btree->modified && !bulk && F_ISSET(btree, WT_BTREE_NO_LOGGING) && (S2C(session)->txn_global.has_stable_timestamp || (!F_ISSET(S2C(session), WT_CONN_FILE_CLOSE_SYNC) && !metadata))) return (__wt_set_return(session, EBUSY)); |