diff options
-rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
-rw-r--r-- | src/third_party/wiredtiger/src/txn/txn.c | 17 | ||||
-rw-r--r-- | src/third_party/wiredtiger/test/suite/test_prepare25.py | 137 |
3 files changed, 154 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index f2eff9e7272..66a7adfbc66 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-6.0", - "commit": "d90f4fa81dec7af7d20f7ee52f3d1258aa2c20e6" + "commit": "8e14a40cb6db5cd5d021c111b8e1abcaff7b79bc" } diff --git a/src/third_party/wiredtiger/src/txn/txn.c b/src/third_party/wiredtiger/src/txn/txn.c index 2f3a3598dc9..26bce24dd44 100644 --- a/src/third_party/wiredtiger/src/txn/txn.c +++ b/src/third_party/wiredtiger/src/txn/txn.c @@ -1260,7 +1260,22 @@ __txn_resolve_prepared_op(WT_SESSION_IMPL *session, WT_TXN_OP *op, bool commit, (upd->next != NULL && upd->durable_ts == upd->next->durable_ts && upd->txnid == upd->next->txnid && upd->start_ts == upd->next->start_ts))) resolve_case = RESOLVE_PREPARE_ON_DISK; - else if (first_committed_upd != NULL && F_ISSET(first_committed_upd, WT_UPDATE_HS)) + /* + * If the first committed update older than the prepared update has already been marked to be + * deleted from the history store, we are in the case that there was an older prepared update + * that was rolled back. + * + * 1) We have a prepared update Up and an update U on the update chain initially. + * 2) An eviction writes Up to the disk and U to the history store. + * 3) The eviction fails and everything is restored. + * 4) We rollback Up and mark U to be deleted from the history store. + * 5) We add another prepared update to the update chain. + * + * Check the WT_UPDATE_TO_DELETE_FROM_HS to see if we have already handled the older prepared + * update or not. Ignore if it is already handled. + */ + else if (first_committed_upd != NULL && F_ISSET(first_committed_upd, WT_UPDATE_HS) && + !F_ISSET(first_committed_upd, WT_UPDATE_TO_DELETE_FROM_HS)) resolve_case = RESOLVE_PREPARE_EVICTION_FAILURE; else if (F_ISSET(S2C(session), WT_CONN_IN_MEMORY)) resolve_case = RESOLVE_IN_MEMORY; diff --git a/src/third_party/wiredtiger/test/suite/test_prepare25.py b/src/third_party/wiredtiger/test/suite/test_prepare25.py new file mode 100644 index 00000000000..95fce47181d --- /dev/null +++ b/src/third_party/wiredtiger/test/suite/test_prepare25.py @@ -0,0 +1,137 @@ +#!/usr/bin/env python +# +# Public Domain 2014-present MongoDB, Inc. +# Public Domain 2008-2014 WiredTiger, Inc. +# +# This is free and unencumbered software released into the public domain. +# +# Anyone is free to copy, modify, publish, use, compile, sell, or +# distribute this software, either in source code form or as a compiled +# binary, for any purpose, commercial or non-commercial, and by any +# means. +# +# In jurisdictions that recognize copyright laws, the author or authors +# of this software dedicate any and all copyright interest in the +# software to the public domain. We make this dedication for the benefit +# of the public at large and to the detriment of our heirs and +# successors. We intend this dedication to be an overt act of +# relinquishment in perpetuity of all present and future rights to this +# software under copyright law. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. + +import wiredtiger, wttest +from wtscenario import make_scenarios + +# test_prepare25.py +# Test prepare rollback and then prepare commit with failed eviction. +class test_prepare23(wttest.WiredTigerTestCase): + conn_config = 'timing_stress_for_test=[failpoint_eviction_fail_after_reconciliation]' + + format_values = [ + ('column', dict(key_format='r', value_format='S')), + ('column_fix', dict(key_format='r', value_format='8t')), + ('row_integer', dict(key_format='i', value_format='S')), + ] + + delete = [ + ('delete', dict(delete=True)), + ('non-delete', dict(delete=False)), + ] + + scenarios = make_scenarios(format_values, delete) + + def test_prepare25(self): + uri = "table:test_prepare25" + self.session.create(uri, 'key_format=' + self.key_format + ',value_format=' + self.value_format) + + if self.value_format == '8t': + value_a = 97 + value_b = 98 + value_c = 99 + else: + value_a = "a" + value_b = "b" + value_c = "c" + + # Pin oldest timestamp to 1 + self.conn.set_timestamp('oldest_timestamp=' + self.timestamp_str(1)) + + cursor = self.session.open_cursor(uri) + session2 = self.conn.open_session() + evict_cursor = session2.open_cursor(uri, None, 'debug=(release_evict)') + ts = 0 + for i in range (1, 1001): + # Insert an update + self.session.begin_transaction() + cursor[i] = value_a + self.session.commit_transaction('commit_timestamp=' + self.timestamp_str(ts + 10)) + + if self.delete: + self.session.begin_transaction() + cursor.set_key(i) + cursor.remove() + self.session.commit_transaction('commit_timestamp=' + self.timestamp_str(ts + 20)) + + # Do a prepared update + self.session.begin_transaction() + cursor[i] = value_b + self.session.prepare_transaction('prepare_timestamp=' + self.timestamp_str(ts + 30)) + cursor.reset() + + # Evict the page + session2.begin_transaction('ignore_prepare=true,read_timestamp=' + self.timestamp_str(ts + 10)) + self.assertEquals(evict_cursor[i], value_a) + evict_cursor.reset() + session2.rollback_transaction() + + # Rollback the prepared transaction + self.session.rollback_transaction() + + # Do another prepared update + self.session.begin_transaction() + cursor[i] = value_c + self.session.prepare_transaction('prepare_timestamp=' + self.timestamp_str(ts + 40)) + + # Commit the prepared update + self.session.timestamp_transaction('commit_timestamp=' + self.timestamp_str(ts + 40)) + self.session.timestamp_transaction('durable_timestamp=' + self.timestamp_str(ts + 50)) + self.session.commit_transaction() + cursor.reset() + + # Evict the page again + session2.begin_transaction('ignore_prepare=true,read_timestamp=' + self.timestamp_str(ts + 10)) + self.assertEquals(evict_cursor[i], value_a) + evict_cursor.reset() + session2.rollback_transaction() + + # Verify we can still read back value a + self.session.begin_transaction('read_timestamp=' + self.timestamp_str(ts + 10)) + self.assertEquals(cursor[i], value_a) + self.session.rollback_transaction() + + # Verify we can still read back the deletion + if self.delete: + self.session.begin_transaction('read_timestamp=' + self.timestamp_str(ts + 20)) + if self.value_format == '8t': + self.assertEquals(cursor[i], 0) + else: + cursor.set_key(i) + self.assertEquals(cursor.search(), wiredtiger.WT_NOTFOUND) + self.session.rollback_transaction() + + # Verify we can still read back value c + self.session.begin_transaction('read_timestamp=' + self.timestamp_str(ts + 40)) + self.assertEquals(cursor[i], value_c) + self.session.rollback_transaction() + + ts += 50 + +if __name__ == '__main__': + wttest.run() |