diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-11-15 03:22:29 +1100 |
|---|---|---|
| committer | sueloverso <sue@mongodb.com> | 2016-11-14 11:22:29 -0500 |
| commit | adfd8056806c640a8d8aaba8766d07dd5fc79569 (patch) | |
| tree | a6ca58e35dfa5f103867f228712efce33c90b68e /src/conn | |
| parent | 6497ce8d1c78ff706f4454e16c93f0dbf3e04ef7 (diff) | |
| download | mongo-adfd8056806c640a8d8aaba8766d07dd5fc79569.tar.gz | |
WT-2984 Keep sufficient history in the metadata for queries. (#3144)
* WT-2984 Keep sufficient history in the metadata for queries.
Since we treat the checkpoint transaction specially, we also have to
track the amount of history required for the metadata specially.
Previously, there was a window where a query started while a checkpoint
was running could fail to see the results of the checkpoint when it
queried the metadata.
* Remove the unused "session" argument to WT_IS_METADATA.
Diffstat (limited to 'src/conn')
| -rw-r--r-- | src/conn/conn_dhandle.c | 4 | ||||
| -rw-r--r-- | src/conn/conn_open.c | 3 | ||||
| -rw-r--r-- | src/conn/conn_sweep.c | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/conn/conn_dhandle.c b/src/conn/conn_dhandle.c index ac72e330b67..e9e3925c57e 100644 --- a/src/conn/conn_dhandle.c +++ b/src/conn/conn_dhandle.c @@ -447,7 +447,7 @@ __wt_conn_btree_apply(WT_SESSION_IMPL *session, const char *uri, F_ISSET(dhandle, WT_DHANDLE_DEAD) || dhandle->checkpoint != NULL || !WT_PREFIX_MATCH(dhandle->name, "file:") || - WT_IS_METADATA(session, dhandle)) + WT_IS_METADATA(dhandle)) continue; WT_RET(__conn_btree_apply_internal( session, dhandle, file_func, name_func, cfg)); @@ -627,7 +627,7 @@ __wt_conn_dhandle_discard(WT_SESSION_IMPL *session) */ restart: TAILQ_FOREACH(dhandle, &conn->dhqh, q) { - if (WT_IS_METADATA(session, dhandle)) + if (WT_IS_METADATA(dhandle)) continue; WT_WITH_DHANDLE(session, dhandle, diff --git a/src/conn/conn_open.c b/src/conn/conn_open.c index 69b50147bf5..6454503d6cb 100644 --- a/src/conn/conn_open.c +++ b/src/conn/conn_open.c @@ -95,7 +95,8 @@ __wt_connection_close(WT_CONNECTION_IMPL *conn) for (;;) { WT_TRET(__wt_txn_update_oldest(session, WT_TXN_OLDEST_STRICT | WT_TXN_OLDEST_WAIT)); - if (txn_global->oldest_id == txn_global->current) + if (txn_global->oldest_id == txn_global->current && + txn_global->metadata_pinned == txn_global->current) break; __wt_yield(); } diff --git a/src/conn/conn_sweep.c b/src/conn/conn_sweep.c index dba37fa2eb0..d1254d8afcc 100644 --- a/src/conn/conn_sweep.c +++ b/src/conn/conn_sweep.c @@ -26,7 +26,7 @@ __sweep_mark(WT_SESSION_IMPL *session, time_t now) conn = S2C(session); TAILQ_FOREACH(dhandle, &conn->dhqh, q) { - if (WT_IS_METADATA(session, dhandle)) + if (WT_IS_METADATA(dhandle)) continue; /* @@ -122,7 +122,7 @@ __sweep_expire(WT_SESSION_IMPL *session, time_t now) if (conn->open_btree_count < conn->sweep_handles_min) break; - if (WT_IS_METADATA(session, dhandle) || + if (WT_IS_METADATA(dhandle) || !F_ISSET(dhandle, WT_DHANDLE_OPEN) || dhandle->session_inuse != 0 || dhandle->timeofdeath == 0 || @@ -228,7 +228,7 @@ __sweep_remove_handles(WT_SESSION_IMPL *session) dhandle != NULL; dhandle = dhandle_next) { dhandle_next = TAILQ_NEXT(dhandle, q); - if (WT_IS_METADATA(session, dhandle)) + if (WT_IS_METADATA(dhandle)) continue; if (!WT_DHANDLE_CAN_DISCARD(dhandle)) continue; |