summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/lsm/lsm_work_unit.c
diff options
context:
space:
mode:
authorAlex Gorrod <alexg@wiredtiger.com>2016-02-29 16:12:10 +1100
committerAlex Gorrod <alexg@wiredtiger.com>2016-02-29 16:13:10 +1100
commitff0846809805c5a9a961314d3b6ec9ed7bbe0947 (patch)
tree9e48c798ee5718e97e13d064c64f15524b92bdd2 /src/third_party/wiredtiger/src/lsm/lsm_work_unit.c
parent81efb319f05f4ec1b5bd4523b13694241e967fc2 (diff)
downloadmongo-ff0846809805c5a9a961314d3b6ec9ed7bbe0947.tar.gz
Import wiredtiger-wiredtiger-2.7.0-829-g4531b92.tar.gz from wiredtiger branch mongodb-3.4
ref: 4f38287..4531b92 SERVER-22784 Coverity analysis defect 77722: Unused value SERVER-22831 Low query rate with heavy cache pressure and an idle collection WT-2173 test/format cache stuck full WT-2264 Checkpoints cannot keep up with inserts WT-2349 Add ability to open databases read-only WT-2376 Modules should compile without including wt_internal.h header file WT-2382 Problem with custom collator for 'u' format with join cursor WT-2394 Long Unit Test for test_compact02 failed. WT-2395 Recovery failure with an LSM tree WT-2399 Add test case that verifies cursor traversal WT-2405 test utility error handling. WT-2407 recovery lint WT-2409 Minor Perf Regression in LSM WT-2410 Casting function pointers to different types WT-2411 LSM drop hang WT-2412 Truncate error tag is incorrect WT-2417 Windows Jenkins task is failing WT-2419 Tests fail to compile on windows due to new util functions WT-2420 LSM failed to read bytes WT-2423 Session reference count could be wrong if adding the handle fails WT-2425 evict-btree read through performance drop WT-2428 Make statistics logging compatible with MongoDB WT-2429 Add a statistic that tracks aggressive mode in eviction
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.c9
1 files changed, 1 insertions, 8 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 099bde176f7..7723818f607 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_work_unit.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_work_unit.c
@@ -341,20 +341,13 @@ __wt_lsm_checkpoint_chunk(WT_SESSION_IMPL *session,
* time, and our checkpoint operation should be very quick.
*/
WT_ERR(__wt_meta_track_on(session));
- F_SET(session, WT_SESSION_LOCK_NO_WAIT);
WT_WITH_CHECKPOINT_LOCK(session, ret,
WT_WITH_SCHEMA_LOCK(session, ret,
ret = __wt_schema_worker(
session, chunk->uri, __wt_checkpoint, NULL, NULL, 0)));
WT_TRET(__wt_meta_track_off(session, false, ret != 0));
- F_CLR(session, WT_SESSION_LOCK_NO_WAIT);
- if (ret != 0) {
- if (ret == EBUSY) {
- ret = 0;
- goto err;
- }
+ if (ret != 0)
WT_ERR_MSG(session, ret, "LSM checkpoint");
- }
/* Now the file is written, get the chunk size. */
WT_ERR(__wt_lsm_tree_set_chunk_size(session, chunk));