diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2019-06-26 10:55:50 +1000 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2019-06-26 10:55:50 +1000 |
| commit | de6592f457144d3391e108f0d9fc41436a3655e9 (patch) | |
| tree | c0ca2b2e0e63366d8e6f310402d317858dfcdd0b /src/third_party/wiredtiger/src/txn | |
| parent | 21f0a00b54c9fac5ac99aa0d2f81039c8564c6c9 (diff) | |
| download | mongo-e025e925ee68694b22ccb4a8d6dda91ec444cf30.tar.gz | |
Import wiredtiger: ee1bae262347285f46b5c56cc0490d20b9ee9c98 from branch mongodb-4.2r4.2.0-rc2
ref: 40e3225e55..ee1bae2623
for: 4.2.0-rc2
WT-4694 Dynamic compression throughput varies widely
WT-4798 Fix bug in picking random dhandle for eviction
WT-4862 WT_SESSION.import implies an additional write during checkpoints without an avail list
WT-4863 Prototype WiredTiger inline functions
WT-4869 Stop adding cache pressure when eviction is falling behind
Diffstat (limited to 'src/third_party/wiredtiger/src/txn')
| -rw-r--r-- | src/third_party/wiredtiger/src/txn/txn.c | 8 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/txn/txn_ext.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/txn/txn.c b/src/third_party/wiredtiger/src/txn/txn.c index 2449c1ccabe..0469882c08e 100644 --- a/src/third_party/wiredtiger/src/txn/txn.c +++ b/src/third_party/wiredtiger/src/txn/txn.c @@ -1038,7 +1038,7 @@ __wt_txn_commit(WT_SESSION_IMPL *session, const char *cfg[]) * any cached snapshots have to be refreshed. */ if (!readonly) - (void)__wt_gen_next(session, WT_GEN_COMMIT); + WT_IGNORE_RET(__wt_gen_next(session, WT_GEN_COMMIT)); /* First check if we've already committed something in the future. */ if (update_timestamp) { @@ -1067,7 +1067,8 @@ __wt_txn_commit(WT_SESSION_IMPL *session, const char *cfg[]) * because the user's data is committed. */ if (!readonly) - (void)__wt_cache_eviction_check(session, false, false, NULL); + WT_IGNORE_RET( + __wt_cache_eviction_check(session, false, false, NULL)); return (0); err: /* @@ -1301,7 +1302,8 @@ __wt_txn_rollback(WT_SESSION_IMPL *session, const char *cfg[]) * because the user's data is committed. */ if (!readonly) - (void)__wt_cache_eviction_check(session, false, false, NULL); + WT_IGNORE_RET( + __wt_cache_eviction_check(session, false, false, NULL)); return (ret); } diff --git a/src/third_party/wiredtiger/src/txn/txn_ext.c b/src/third_party/wiredtiger/src/txn/txn_ext.c index 324980b2460..1f42ab5eb43 100644 --- a/src/third_party/wiredtiger/src/txn/txn_ext.c +++ b/src/third_party/wiredtiger/src/txn/txn_ext.c @@ -20,7 +20,7 @@ __wt_ext_transaction_id(WT_EXTENSION_API *wt_api, WT_SESSION *wt_session) (void)wt_api; /* Unused parameters */ session = (WT_SESSION_IMPL *)wt_session; /* Ignore failures: the only case is running out of transaction IDs. */ - (void)__wt_txn_id_check(session); + WT_IGNORE_RET(__wt_txn_id_check(session)); return (session->txn.id); } |