diff options
| author | Matt Kangas <matt.kangas@mongodb.com> | 2014-12-17 10:30:34 -0500 |
|---|---|---|
| committer | Matt Kangas <matt.kangas@mongodb.com> | 2014-12-17 10:30:34 -0500 |
| commit | 09a1b0ca18b5340f5383d541abe96beb186a515a (patch) | |
| tree | 0f3ee4393728b4e7d79b2aa23fe87f9a4e3593a1 /src/third_party/wiredtiger/src/conn/conn_open.c | |
| parent | 3077abf30145174c4cab2779de7a621c2dd42062 (diff) | |
| download | mongo-09a1b0ca18b5340f5383d541abe96beb186a515a.tar.gz | |
Import wiredtiger-wiredtiger-2.8-rc2-253-g379ffab.tar.gz from wiredtiger branch mongodb-2.8
Diffstat (limited to 'src/third_party/wiredtiger/src/conn/conn_open.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/conn/conn_open.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/conn/conn_open.c b/src/third_party/wiredtiger/src/conn/conn_open.c index f77f38ee01c..97ced7d5263 100644 --- a/src/third_party/wiredtiger/src/conn/conn_open.c +++ b/src/third_party/wiredtiger/src/conn/conn_open.c @@ -122,13 +122,14 @@ __wt_connection_close(WT_CONNECTION_IMPL *conn) /* * Now that all data handles are closed, tell logging that a checkpoint * has completed then shut down the log manager (only after closing - * data handles). + * data handles). The call to destroy the log manager is outside the + * conditional because we allocate the log path so that printlog can + * run without running logging or recovery. */ - if (FLD_ISSET(conn->log_flags, WT_CONN_LOG_ENABLED)) { + if (FLD_ISSET(conn->log_flags, WT_CONN_LOG_ENABLED)) WT_TRET(__wt_txn_checkpoint_log( session, 1, WT_TXN_LOG_CKPT_STOP, NULL)); - WT_TRET(__wt_logmgr_destroy(session)); - } + WT_TRET(__wt_logmgr_destroy(session)); /* Free memory for collators, compressors, data sources. */ WT_TRET(__wt_conn_remove_collator(session)); |