summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/conn/conn_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/third_party/wiredtiger/src/conn/conn_api.c')
-rw-r--r--src/third_party/wiredtiger/src/conn/conn_api.c7
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");