diff options
author | Keith Bostic <keith@wiredtiger.com> | 2014-05-20 12:33:26 -0400 |
---|---|---|
committer | Keith Bostic <keith@wiredtiger.com> | 2014-05-20 12:33:26 -0400 |
commit | 89a0f7a61239ceaa539567869391bb0647c8c2a2 (patch) | |
tree | aff110bbc11fc87a5cc75fc004ab2e38ea69679f /dist | |
parent | ebd3e8e7b531671e8339b2df6ce0738be520b619 (diff) | |
download | mongo-89a0f7a61239ceaa539567869391bb0647c8c2a2.tar.gz |
Rename WT_EVICTION_LOCKED to WT_EVICTING, we're going to set it when
closing files as well as when evicting pages via the eviction server.
The meaning is when that flag is set and there's an update we can't
write, we quit reconciliation early because the page cannot be evicted.
Change the __evict_file() support for close to set the WT_EVICTING flag,
but not set the WT_SKIP_UPDATE_ERR flag. This change means the EBUSY
we get when attempting to close a file that has updates that aren't yet
globally visible surfaces in the connection data handle code, rather
than resulting in a panic inside of reconciliation.
Move the reconciliation "panic if not allowed to skip updates" code back
into the code that first encounters those updates, rather than checking
at reconciliation wrapup -- it shouldn't be a change to the semantics,
but I think it's a little safer/cleaner/consistent.
Diffstat (limited to 'dist')
-rw-r--r-- | dist/flags.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/flags.py b/dist/flags.py index baea0efd7a4..c86264ad950 100644 --- a/dist/flags.py +++ b/dist/flags.py @@ -41,7 +41,7 @@ flags = { 'READ_WONT_NEED', ], 'rec_write' : [ - 'EVICTION_LOCKED', + 'EVICTING', 'SKIP_UPDATE_ERR', 'SKIP_UPDATE_RESTORE' ], |