diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-06-20 03:17:58 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-06-20 03:46:55 +0000 |
| commit | 991697d7ec688b87e534b581ef5d810349be86d4 (patch) | |
| tree | ca7368b2e92cdc6123ecdb8025b5f51ccc71f737 /src/third_party | |
| parent | a76e4ce18640287c3ddd839c7cb820f63b672746 (diff) | |
| download | mongo-991697d7ec688b87e534b581ef5d810349be86d4.tar.gz | |
Import wiredtiger: 6942de44633e8b5acb4b17ae165f58adfc569b0d from branch mongodb-master
ref: cd83c1ce55..6942de4463
for: 6.1.0-rc0
WT-9467 Fix a comment in txn_begin about having allocated txn-id
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/txn_inline.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index cee21f07d89..7a3debf5fb7 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": "cd83c1ce55d4c46bce5a16b56ed84c66ca340da9" + "commit": "6942de44633e8b5acb4b17ae165f58adfc569b0d" } diff --git a/src/third_party/wiredtiger/src/include/txn_inline.h b/src/third_party/wiredtiger/src/include/txn_inline.h index fefc159be58..ce2f47ca5d6 100644 --- a/src/third_party/wiredtiger/src/include/txn_inline.h +++ b/src/third_party/wiredtiger/src/include/txn_inline.h @@ -1194,9 +1194,8 @@ __wt_txn_begin(WT_SESSION_IMPL *session, const char *cfg[]) WT_RET(__wt_session_copy_values(session)); /* - * Stall here if the cache is completely full. We have allocated a transaction ID which - * makes it possible for eviction to decide we're contributing to the problem and return - * WT_ROLLBACK. The WT_SESSION.begin_transaction API can't return rollback, continue on. + * Stall here if the cache is completely full. Eviction check can return rollback, but the + * WT_SESSION.begin_transaction API can't, continue on. */ WT_RET_ERROR_OK(__wt_cache_eviction_check(session, false, true, NULL), WT_ROLLBACK); |