diff options
Diffstat (limited to 'src/third_party/wiredtiger/src/txn/txn_ckpt.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/txn/txn_ckpt.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/third_party/wiredtiger/src/txn/txn_ckpt.c b/src/third_party/wiredtiger/src/txn/txn_ckpt.c index 616816f0e8d..0a1636ecef6 100644 --- a/src/third_party/wiredtiger/src/txn/txn_ckpt.c +++ b/src/third_party/wiredtiger/src/txn/txn_ckpt.c @@ -612,7 +612,8 @@ __checkpoint_fail_reset(WT_SESSION_IMPL *session) * Start the transaction for a checkpoint and gather handles. */ static int -__checkpoint_prepare(WT_SESSION_IMPL *session, const char *cfg[]) +__checkpoint_prepare( + WT_SESSION_IMPL *session, bool *trackingp, const char *cfg[]) { WT_CONFIG_ITEM cval; WT_CONNECTION_IMPL *conn; @@ -646,6 +647,10 @@ __checkpoint_prepare(WT_SESSION_IMPL *session, const char *cfg[]) /* Ensure a transaction ID is allocated prior to sharing it globally */ WT_RET(__wt_txn_id_check(session)); + /* Keep track of handles acquired for locking. */ + WT_RET(__wt_meta_track_on(session)); + *trackingp = true; + /* * Mark the connection as clean. If some data gets modified after * generating checkpoint transaction id, connection will be reset to @@ -706,7 +711,8 @@ __checkpoint_prepare(WT_SESSION_IMPL *session, const char *cfg[]) __wt_timestamp_set( &txn->read_timestamp, &txn_global->stable_timestamp); F_SET(txn, WT_TXN_HAS_TS_READ); - } + } else + __wt_timestamp_set_zero(&txn->read_timestamp); #else WT_UNUSED(use_timestamp); #endif @@ -820,10 +826,6 @@ __txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]) generation = __wt_gen_next(session, WT_GEN_CHECKPOINT); WT_STAT_CONN_SET(session, txn_checkpoint_generation, generation); - /* Keep track of handles acquired for locking. */ - WT_ERR(__wt_meta_track_on(session)); - tracking = true; - /* * We want to skip checkpointing clean handles whenever possible. That * is, when the checkpoint is not named or forced. However, we need to @@ -839,7 +841,8 @@ __txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]) * Hold the schema lock while starting the transaction and gathering * handles so the set we get is complete and correct. */ - WT_WITH_SCHEMA_LOCK(session, ret = __checkpoint_prepare(session, cfg)); + WT_WITH_SCHEMA_LOCK(session, + ret = __checkpoint_prepare(session, &tracking, cfg)); WT_ERR(ret); WT_ASSERT(session, txn->isolation == WT_ISO_SNAPSHOT); |