diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-05-28 08:36:46 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-05-29 15:44:50 +1000 |
| commit | 166c533b55417bff1c9c2f25c67322362ff12132 (patch) | |
| tree | 17e03ab1705072440d601290948e764a376e28cd | |
| parent | d805b6cdbe986f9c95bb97521e17fd8f00c768be (diff) | |
| download | mongo-166c533b55417bff1c9c2f25c67322362ff12132.tar.gz | |
Merge pull request #1998 from wiredtiger/wrong-update-restore-flag
We were checking the wrong flags value for WT_SKIP_UPDATE_RESTORE
(cherry picked from commit ed5ca41c9d127c3af7773ddf87e6a332df0e722c)
| -rw-r--r-- | src/evict/evict_page.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/evict/evict_page.c b/src/evict/evict_page.c index e9d1616149e..c58827e0e4d 100644 --- a/src/evict/evict_page.c +++ b/src/evict/evict_page.c @@ -275,7 +275,7 @@ __evict_review( WT_DECL_RET; WT_PAGE *page; WT_PAGE_MODIFY *mod; - uint32_t flags; + uint32_t reconcile_flags; /* * Get exclusive access to the page if our caller doesn't have the tree @@ -349,7 +349,7 @@ __evict_review( * Don't set the update-restore flag for internal pages, they don't have * updates that can be saved and restored. */ - flags = WT_EVICTING; + reconcile_flags = WT_EVICTING; if (__wt_page_is_modified(page)) { if (exclusive) LF_SET(WT_SKIP_UPDATE_ERR); @@ -368,7 +368,7 @@ __evict_review( */ if (!exclusive && mod != NULL && !__wt_txn_visible_all(session, mod->rec_max_txn) && - !LF_ISSET(WT_SKIP_UPDATE_RESTORE)) + !FLD_ISSET(reconcile_flags, WT_SKIP_UPDATE_RESTORE)) return (EBUSY); return (0); |