diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2017-11-13 16:22:24 +1100 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2017-11-13 16:22:24 +1100 |
| commit | c298f081852f1fc1ae4a51ed8997bd0fd15bb5aa (patch) | |
| tree | 3ba7640ee72b7c1360989f5ccff34ba7ebfa2fb3 | |
| parent | 6554a50f2810b9e233f8cb6077d831e43ff2f8aa (diff) | |
| download | mongo-c298f081852f1fc1ae4a51ed8997bd0fd15bb5aa.tar.gz | |
Import wiredtiger: ce5ee5097b499fb1bfa8a7ccb20e1618b68b3378 from branch mongodb-3.6
ref: 3a8316e86e..ce5ee5097b
for: 3.6.0-rc4
WT-3743 Access violation in lookaside sweep
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/cache/cache_las.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 409b0b2906a..194a0b2e3c4 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -1,5 +1,5 @@ { - "commit": "3a8316e86e9c7cd379679d8530ecc54ad9bdf5c1", + "commit": "ce5ee5097b499fb1bfa8a7ccb20e1618b68b3378", "github": "wiredtiger/wiredtiger.git", "vendor": "wiredtiger", "branch": "mongodb-3.6" diff --git a/src/third_party/wiredtiger/src/cache/cache_las.c b/src/third_party/wiredtiger/src/cache/cache_las.c index deed37517bb..35d9f43b172 100644 --- a/src/third_party/wiredtiger/src/cache/cache_las.c +++ b/src/third_party/wiredtiger/src/cache/cache_las.c @@ -849,7 +849,9 @@ __wt_las_sweep(WT_SESSION_IMPL *session) * reconciliation, we can safely remove entries from that point * on (for the given key) that are visible to all readers. */ - if (__bit_test(cache->las_sweep_dropmap, + if (las_id >= cache->las_sweep_dropmin && + las_id <= cache->las_sweep_dropmax && + __bit_test(cache->las_sweep_dropmap, las_id - cache->las_sweep_dropmin)) { WT_ERR(cursor->remove(cursor)); ++remove_cnt; |