diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2018-04-18 15:56:04 +1000 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2018-04-18 15:56:04 +1000 |
| commit | 0ea8ebafc20bb379955b2168b31099aefa220d7b (patch) | |
| tree | 45ae9717fd0db22de6ca56240381c8106a633e7d /src/third_party/wiredtiger/src/conn | |
| parent | f1dce2d1934052cbac4032d0c5833d3857a0cfb2 (diff) | |
| download | mongo-0ea8ebafc20bb379955b2168b31099aefa220d7b.tar.gz | |
Import wiredtiger: ad25980c88b87d45dbcefdb10cdcf696d02a8ac2 from branch mongodb-3.8
ref: 5fc85c47ca..ad25980c88
for: 3.7.6
WT-3998 Fix a bug where stable timestamp was ignored on shutdown
WT-4012 Fix lookaside entry counters
WT-4019 Change test/format to test transaction prepare less often
WT-4027 Yield cursor operations between restarted search/traverse
WT-4031 on-page zero-length row-store values can be discarded from checkpoints
WT-4035 Truncate information discarded while active
WT-4036 Fix Coverity false positive: out-of-bounds access.
WT-4042 Access data handles safely during cursor reopen
Diffstat (limited to 'src/third_party/wiredtiger/src/conn')
| -rw-r--r-- | src/third_party/wiredtiger/src/conn/conn_api.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/src/conn/conn_api.c b/src/third_party/wiredtiger/src/conn/conn_api.c index a8e906a9f19..e753dc1644a 100644 --- a/src/third_party/wiredtiger/src/conn/conn_api.c +++ b/src/third_party/wiredtiger/src/conn/conn_api.c @@ -1101,8 +1101,8 @@ err: /* */ F_SET(conn, WT_CONN_EVICTION_NO_LOOKASIDE); - /* Shut down transactions (wait for in-flight operations to complete. */ - WT_TRET(__wt_txn_global_shutdown(session)); + /* Wait for in-flight operations to complete. */ + WT_TRET(__wt_txn_activity_drain(session)); /* * Perform a system-wide checkpoint so that all tables are consistent @@ -1135,6 +1135,9 @@ err: /* } } + /* Shut down the global transaction state. */ + __wt_txn_global_shutdown(session); + if (ret != 0) { __wt_err(session, ret, "failure during close, disabling further writes"); |