diff options
author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-19 15:09:10 +1100 |
---|---|---|
committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-19 15:09:10 +1100 |
commit | 4a185996c83862c2e4b911ce637591c4ff535108 (patch) | |
tree | 90054641b4553601420173e54f1a39db2929e6ef /src/third_party/wiredtiger/src/lsm/lsm_work_unit.c | |
parent | caba732fb722d5c2257d17dd09dec8a826c13795 (diff) | |
download | mongo-4a185996c83862c2e4b911ce637591c4ff535108.tar.gz |
Import wiredtiger: 8d2324943364286056ae399043f70b8a937de312 from branch mongodb-3.6
ref: 1b6c815a3f..8d23249433
for: 3.5.2
SERVER-26545 Remove fixed-size limitation on WiredTiger hazard pointers
WT-2402 Misaligned structure accesses lead to undefined behavior
WT-283 Add a way to change persistent object settings
WT-3056 For cursors with projections, keys should be allowed
WT-3061 syscall test runs with checkpoint_sync=false and doesn't acknowledge pwrite64
WT-3066 lint
WT-3068 Copy wtperf artifacts when running Jenkins tests
WT-3069 Fix build failures in LevelDB APIs
WT-3070 Fix search_near() for index cursor
WT-3071 Java: fix build with -Werror=sign-conversion
WT-3075 Document and enforce that WiredTiger now depends on Python 2.7
WT-3078 Fix a hang in the reconfiguration test.
WT-3084 Fix Coverity resource leak complaint.
Diffstat (limited to 'src/third_party/wiredtiger/src/lsm/lsm_work_unit.c')
-rw-r--r-- | src/third_party/wiredtiger/src/lsm/lsm_work_unit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_work_unit.c b/src/third_party/wiredtiger/src/lsm/lsm_work_unit.c index f3414363e3e..d9c185a3f58 100644 --- a/src/third_party/wiredtiger/src/lsm/lsm_work_unit.c +++ b/src/third_party/wiredtiger/src/lsm/lsm_work_unit.c @@ -364,7 +364,7 @@ __wt_lsm_checkpoint_chunk(WT_SESSION_IMPL *session, /* Lock the tree, mark the chunk as on disk and update the metadata. */ __wt_lsm_tree_writelock(session, lsm_tree); F_SET(chunk, WT_LSM_CHUNK_ONDISK); - ret = __wt_lsm_meta_write(session, lsm_tree); + ret = __wt_lsm_meta_write(session, lsm_tree, NULL); ++lsm_tree->dsk_gen; /* Update the throttle time. */ @@ -469,7 +469,7 @@ __lsm_bloom_create(WT_SESSION_IMPL *session, /* Ensure the bloom filter is in the metadata. */ __wt_lsm_tree_writelock(session, lsm_tree); F_SET(chunk, WT_LSM_CHUNK_BLOOM); - ret = __wt_lsm_meta_write(session, lsm_tree); + ret = __wt_lsm_meta_write(session, lsm_tree, NULL); ++lsm_tree->dsk_gen; __wt_lsm_tree_writeunlock(session, lsm_tree); @@ -659,7 +659,7 @@ __wt_lsm_free_chunks(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree) err: /* Flush the metadata unless the system is in panic */ if (flush_metadata && ret != WT_PANIC) { __wt_lsm_tree_writelock(session, lsm_tree); - WT_TRET(__wt_lsm_meta_write(session, lsm_tree)); + WT_TRET(__wt_lsm_meta_write(session, lsm_tree, NULL)); __wt_lsm_tree_writeunlock(session, lsm_tree); } __lsm_unpin_chunks(session, &cookie); |