diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2014-12-12 17:21:50 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2014-12-12 17:21:50 +1100 |
| commit | 2f37332e5bbd14823f0c78ad38672dbce074e87f (patch) | |
| tree | c95c7779d2e87a36731fbfae3720b71ab2b1f290 /src/txn | |
| parent | 2cb10882f4f7189a3c2de4d7e187117873fded32 (diff) | |
| download | mongo-2f37332e5bbd14823f0c78ad38672dbce074e87f.tar.gz | |
Ensure metadata table is open at start of checkpoints.
Diffstat (limited to 'src/txn')
| -rw-r--r-- | src/txn/txn_ckpt.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/txn/txn_ckpt.c b/src/txn/txn_ckpt.c index 908e88f7aa9..fe9c9eaf89e 100644 --- a/src/txn/txn_ckpt.c +++ b/src/txn/txn_ckpt.c @@ -326,6 +326,9 @@ __wt_txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]) txn = &session->txn; full = logging = tracking = 0; + /* Ensure the metadata table is open before taking any locks. */ + WT_RET(__wt_metadata_open(session)); + /* * Do a pass over the configuration arguments and figure out what kind * kind of checkpoint this is. @@ -410,12 +413,6 @@ __wt_txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]) WT_ERR(__checkpoint_apply(session, cfg, __wt_checkpoint_sync)); /* - * Checkpoint has already opened other handles - so the metadata - * handle is open as well. - */ - WT_ASSERT(session, session->meta_dhandle != NULL); - - /* * Disable metadata tracking during the metadata checkpoint. * * We don't lock old checkpoints in the metadata file: there is no way |