diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2021-11-15 17:17:23 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-11-15 06:45:10 +0000 |
| commit | efab80a72ec9b915048e97b904ce68e5d17e02d5 (patch) | |
| tree | ad2876c2a224f746fad591853facdebf3ce1feeb /src/third_party | |
| parent | 5ae1743d30a508fbdbb63eb85bcd628c2123a624 (diff) | |
| download | mongo-efab80a72ec9b915048e97b904ce68e5d17e02d5.tar.gz | |
Import wiredtiger: 0968f6ec197a839ae106266c29079cfed145d0ea from branch mongodb-master
ref: 6eeb4f7e61..0968f6ec19
for: 5.2.0
WT-8399 Fix test_hs24.zero_ts_deletes for FLCS deleted rows reading back as 0
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/suite/test_hs24.py | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index a02160f5489..6243adccf62 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-master", - "commit": "6eeb4f7e61e7b34b7667f9fdd20e6ed5c55bd498" + "commit": "0968f6ec197a839ae106266c29079cfed145d0ea" } diff --git a/src/third_party/wiredtiger/test/suite/test_hs24.py b/src/third_party/wiredtiger/test/suite/test_hs24.py index 31543fbb2cd..7da624b7e3c 100644 --- a/src/third_party/wiredtiger/test/suite/test_hs24.py +++ b/src/third_party/wiredtiger/test/suite/test_hs24.py @@ -26,6 +26,8 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. +import time + import wttest, threading, wiredtiger from helper import simulate_crash_restart from wtscenario import make_scenarios @@ -82,6 +84,10 @@ class test_hs24(wttest.WiredTigerTestCase): self.conn.set_timestamp('stable_timestamp=' + self.timestamp_str(5)) thread = threading.Thread(target=self.zero_ts_deletes) thread.start() + # Give the thread a chance to get going. Otherwise typically none of the deletions + # appear in the checkpoint and we lose the ability to test that anything interesting + # happened. + time.sleep(3) self.session.checkpoint() thread.join() simulate_crash_restart(self, '.', "RESTART") @@ -99,6 +105,14 @@ class test_hs24(wttest.WiredTigerTestCase): cursor2.set_key(i) ret = cursor.search() ret2 = cursor2.search() + + # In FLCS, deleted values read back as 0. Adjust accordingly. + if self.value_format == '8t': + if ret == 0 and cursor.get_value() == 0: + ret = wiredtiger.WT_NOTFOUND + if ret2 == 0 and cursor2.get_value() == 0: + ret2 = wiredtiger.WT_NOTFOUND + if not newer_data_visible: newer_data_visible = ret != wiredtiger.WT_NOTFOUND if newer_data_visible: |