diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-11-02 17:13:12 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-11-02 17:13:12 +1100 |
| commit | f4aab28b9bf75c28c1fcb99ffc1879bc0510056f (patch) | |
| tree | eb1597ad2c63ae746b7cae615f33379fd5577080 | |
| parent | 4ba56985d6cb290e1981018fd04b017f5dcdad90 (diff) | |
| download | mongo-f4aab28b9bf75c28c1fcb99ffc1879bc0510056f.tar.gz | |
WT-2193 Handle read-committed metadata checkpoints during snapshot transactions.
| -rw-r--r-- | src/btree/bt_sync.c | 16 | ||||
| -rw-r--r-- | src/txn/txn.c | 3 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/btree/bt_sync.c b/src/btree/bt_sync.c index 237d900c3d1..645f720d38e 100644 --- a/src/btree/bt_sync.c +++ b/src/btree/bt_sync.c @@ -22,16 +22,17 @@ __sync_file(WT_SESSION_IMPL *session, int syncop) WT_PAGE_MODIFY *mod; WT_REF *walk; WT_TXN *txn; - uint64_t internal_bytes, leaf_bytes; - uint64_t internal_pages, leaf_pages; + uint64_t internal_bytes, internal_pages, leaf_bytes, leaf_pages; + uint64_t saved_snap_min; uint32_t flags; bool evict_reset; btree = S2BT(session); - flags = WT_READ_CACHE | WT_READ_NO_GEN; walk = NULL; txn = &session->txn; + saved_snap_min = WT_SESSION_TXN_STATE(session)->snap_min; + flags = WT_READ_CACHE | WT_READ_NO_GEN; internal_bytes = leaf_bytes = 0; internal_pages = leaf_pages = 0; @@ -110,6 +111,8 @@ __sync_file(WT_SESSION_IMPL *session, int syncop) /* Write all dirty in-cache pages. */ flags |= WT_READ_NO_EVICT; for (walk = NULL;;) { + if (txn->isolation == WT_ISO_READ_COMMITTED) + __wt_txn_get_snapshot(session); WT_ERR(__wt_tree_walk(session, &walk, NULL, flags)); if (walk == NULL) break; @@ -174,7 +177,12 @@ err: /* On error, clear any left-over tree walk. */ if (walk != NULL) WT_TRET(__wt_page_release(session, walk, flags)); - if (txn->isolation == WT_ISO_READ_COMMITTED && session->ncursors == 0) + /* + * If we got a snapshot in order to write pages, and there was no + * snapshot active when we started, release it. + */ + if (txn->isolation == WT_ISO_READ_COMMITTED && + saved_snap_min == WT_TXN_NONE) __wt_txn_release_snapshot(session); if (btree->checkpointing != WT_CKPT_OFF) { diff --git a/src/txn/txn.c b/src/txn/txn.c index a37fa3555b0..cef592720e5 100644 --- a/src/txn/txn.c +++ b/src/txn/txn.c @@ -180,7 +180,8 @@ __wt_txn_get_snapshot(WT_SESSION_IMPL *session) */ WT_ASSERT(session, WT_TXNID_LE(prev_oldest_id, snap_min)); WT_ASSERT(session, prev_oldest_id == txn_global->oldest_id); - txn_state->snap_min = snap_min; + if (txn->forced_iso == 0 || txn_state->snap_min == WT_TXN_NONE) + txn_state->snap_min = snap_min; WT_ASSERT(session, txn_global->scan_count > 0); (void)__wt_atomic_subiv32(&txn_global->scan_count, 1); |