summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsueloverso <sue@mongodb.com>2015-01-26 11:26:54 -0500
committersueloverso <sue@mongodb.com>2015-01-26 11:26:54 -0500
commit34fde1b48308f194d9fc9845a3ca9f3ea358b001 (patch)
treedd96a068de7ab41eb80c02c952ef0309549cbaad
parentba23ee71f709d28ed9fca71dd371fcfb123da1af (diff)
parent1ce3b94d6e40d37a77e62eda500f286bd3816eb9 (diff)
downloadmongo-34fde1b48308f194d9fc9845a3ca9f3ea358b001.tar.gz
Merge pull request #1599 from wiredtiger/checkpoint-list-table-lock
Grab the table list lock while building the list of handles to checkpoint
-rw-r--r--src/txn/txn_ckpt.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/txn/txn_ckpt.c b/src/txn/txn_ckpt.c
index 0cd341185f2..eae21d0b9f5 100644
--- a/src/txn/txn_ckpt.c
+++ b/src/txn/txn_ckpt.c
@@ -341,9 +341,10 @@ __wt_txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[])
* into the session cache, but we're going to do that eventually anyway.
*/
WT_WITH_SCHEMA_LOCK(session,
- WT_WITH_DHANDLE_LOCK(session,
- ret = __checkpoint_apply_all(
- session, cfg, __wt_checkpoint_list, NULL)));
+ WT_WITH_TABLE_LOCK(session,
+ WT_WITH_DHANDLE_LOCK(session,
+ ret = __checkpoint_apply_all(
+ session, cfg, __wt_checkpoint_list, NULL))));
WT_ERR(ret);
/*