diff options
author | Luke Chen <luke.chen@mongodb.com> | 2021-01-07 15:09:05 +1100 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-01-07 04:22:09 +0000 |
commit | 8ea201889b4a4fafdd3acb5d651da398b0147d63 (patch) | |
tree | 23de5bfd4624717c30400416d9d786be15c8a49b /src/third_party/wiredtiger/src/cursor | |
parent | 1034e166dd7cbe72b2a9b772b24f582fd701a14e (diff) | |
download | mongo-8ea201889b4a4fafdd3acb5d651da398b0147d63.tar.gz |
Import wiredtiger: 357d565eee34b54c7725a0c6f7fb65c1dffa26d1 from branch mongodb-4.4
ref: 1fcb0f1e1d..357d565eee
for: 4.4.4
WT-4625 Add a check for camelCase names
WT-5101 Make Clang Format recognise remaining loop macros
WT-6313 Added verify_metadata configuration to the exclusion list when writing to basecfg
WT-6568 Fix split generation use
WT-6677 Map read committed/uncommitted isolation to read-only transaction
WT-6710 Change the default transaction isolation to snapshot
WT-6711 Add new API WT_SESSION.reset_snapshot to update the snapshot
WT-6802 Don't set operation timer for internal and reentry api calls
WT-6848 Split the program into test and framework components
WT-6888 WTPERF reports incorrect upper bound item count during populate
WT-6969 Do not update the existing snapshot for autocommit transactions
WT-6990 New cursor debug configuration isn't considered in __wt_cursor_cache_get
WT-6996 Fix suite_random.rand32() in python test suite
WT-7027 Run the metadata checkpoint for force_stop at read-committed isolation for incremental backup
Diffstat (limited to 'src/third_party/wiredtiger/src/cursor')
-rw-r--r-- | src/third_party/wiredtiger/src/cursor/cur_backup.c | 8 | ||||
-rw-r--r-- | src/third_party/wiredtiger/src/cursor/cur_std.c | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/src/cursor/cur_backup.c b/src/third_party/wiredtiger/src/cursor/cur_backup.c index a32b5ddf974..6a03b7ea5b3 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_backup.c +++ b/src/third_party/wiredtiger/src/cursor/cur_backup.c @@ -211,8 +211,14 @@ err: */ cfg[0] = WT_CONFIG_BASE(session, WT_SESSION_checkpoint); cfg[1] = "force=true"; + /* + * Metadata checkpoints rely on read-committed isolation. Use that here no matter what + * isolation the caller's session sets for isolation. + */ WT_WITH_DHANDLE(session, WT_SESSION_META_DHANDLE(session), - WT_WITH_METADATA_LOCK(session, ret = __wt_checkpoint(session, cfg))); + WT_WITH_METADATA_LOCK(session, + WT_WITH_TXN_ISOLATION( + session, WT_ISO_READ_COMMITTED, ret = __wt_checkpoint(session, cfg)))); } /* diff --git a/src/third_party/wiredtiger/src/cursor/cur_std.c b/src/third_party/wiredtiger/src/cursor/cur_std.c index 92b8e5c5b3e..c34d736b594 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_std.c +++ b/src/third_party/wiredtiger/src/cursor/cur_std.c @@ -798,6 +798,10 @@ __wt_cursor_cache_get(WT_SESSION_IMPL *session, const char *uri, WT_CURSOR *to_d if (cval.val) return (WT_NOTFOUND); + WT_RET(__wt_config_gets_def(session, cfg, "debug", 0, &cval)); + if (cval.len != 0) + return (WT_NOTFOUND); + WT_RET(__wt_config_gets_def(session, cfg, "dump", 0, &cval)); if (cval.len != 0) return (WT_NOTFOUND); |