diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-07-15 12:43:22 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-07-15 12:43:22 +1000 |
| commit | e6f15b1b3edcb0fd379996ccf08a324ff2375dd6 (patch) | |
| tree | 55e7798d4951a877c71d4bc1b0b0941162ae0b3e | |
| parent | 31eef3e5e0f99ac1f3f1dddf2e2a3f80d69d8de5 (diff) | |
| download | mongo-e6f15b1b3edcb0fd379996ccf08a324ff2375dd6.tar.gz | |
Backout a partial fix for a recovery issue discovered when testing the LevelDB API.
| -rw-r--r-- | src/txn/txn_recover.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/txn/txn_recover.c b/src/txn/txn_recover.c index 5a6c216375c..9aa104a1aab 100644 --- a/src/txn/txn_recover.c +++ b/src/txn/txn_recover.c @@ -430,23 +430,15 @@ __wt_txn_recover(WT_SESSION_IMPL *default_session) */ if (!was_backup) { r.metadata_only = 1; - if (IS_INIT_LSN(&r.files[0].ckpt_lsn) || - LOG_CMP(&r.files[0].ckpt_lsn, &conn->log->first_lsn) < 0) + if (IS_INIT_LSN(&r.files[0].ckpt_lsn)) WT_ERR(__wt_log_scan(session, NULL, WT_LOGSCAN_FIRST, __txn_log_recover, &r)); else WT_ERR(__wt_log_scan(session, &r.files[0].ckpt_lsn, 0, __txn_log_recover, &r)); -#if 0 - /* - * With multiple open / close cycles, this no longer holds: we - * can end up with empty log files after multiple recovery - * runs. - */ WT_ASSERT(session, LOG_CMP(&r.ckpt_lsn, &conn->log->first_lsn) >= 0); -#endif } /* Scan the metadata to find the live files and their IDs. */ |