Import wiredtiger: 0cd3d5bbd8a5c8779f1129c6754b4463403e788f from branch mongodb-3.6

ref: 6f561957cb..0cd3d5bbd8
for: 3.5.14

WT-3200       LSM bug: Failed lookup in bloom filter.
WT-3435       Lookaside eviction should be able to save unstable updates
WT-3453       Enhance lookaside table test coverage in Python suite
WT-3559       Detect when a checkpoint races with metadata changes
WT-3579       Enhance support for running wtperf workloads with workgen
WT-3582       Cache stuck full of internal pages
WT-3593       Add an API to enforce consistent use of timestamps (#3667)
WT-3599       reconciliation calculates block matching checksums too frequently.
WT-3600       timestamp API lets you set timestamps with invalid characters
WT-3612       Improve documentation of durability with backup cursors
WT-3613       test/format cache full with LSM
WT-3618       WT remove solaris from evergreen builds
WT-3620       POSIX thread attribute structures must be destroyed
WT-3621       Add test for full backups with concurrent table creation
WT-3622       Allow upper case hexadecimal timestamps
WT-3627       test_txn14.test_txn14.test_log_flush timeout
WT-3631       Convert timestamps to integers in Python tests before comparing
WT-3636       Account for page image sizes in cache consistently
WT-3638       format failure, update list without complete visible record
WT-3639       Test/format tried to drop named checkpoints during a hot backup
WT-3641       Track maximum timestamp used in each btree
WT-3642       Avoid lookaside reads for dead trees

1 files changed, 3 insertions, 8 deletions

diff --git a/src/third_party/wiredtiger/src/lsm/lsm_tree.c b/src/third_party/wiredtiger/src/lsm/lsm_tree.c
index a42fbbe511b..95d025247a6 100644
--- a/src/third_party/wiredtiger/src/lsm/lsm_tree.c
+++ b/src/third_party/wiredtiger/src/lsm/lsm_tree.c
@@ -102,8 +102,6 @@ __lsm_tree_discard(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, bool final)
 static void
 __lsm_tree_close(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, bool final)
 {
-	int i;
-
 	/*
 	 * Stop any new work units being added. The barrier is necessary
 	 * because we rely on the state change being visible before checking
@@ -118,8 +116,7 @@ __lsm_tree_close(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, bool final)
 	 * we know a user is holding a reference to the tree, so exclusive
 	 * access is not available.
 	 */
-	for (i = 0;
-	    lsm_tree->queue_ref > 0 || (final && lsm_tree->refcnt > 1); ++i) {
+	while (lsm_tree->queue_ref > 0 || (final && lsm_tree->refcnt > 1)) {
 		/*
 		 * Remove any work units from the manager queues. Do this step
 		 * repeatedly in case a work unit was in the process of being
@@ -133,10 +130,8 @@ __lsm_tree_close(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, bool final)
 		 * other schema level operations will return EBUSY, even though
 		 * we're dropping the schema lock here.
 		 */
-		if (i % WT_THOUSAND == 0)
-			WT_WITHOUT_LOCKS(session,
-			    __wt_lsm_manager_clear_tree(session, lsm_tree));
-		__wt_yield();
+		WT_WITHOUT_LOCKS(session,
+		    __wt_lsm_manager_clear_tree(session, lsm_tree));
 	}
 }