Import wiredtiger: 2e9744d11a65c63ba7445060dc78371250f04051 from branch mongodb-3.6

ref: 6173a98979..2e9744d11a
for: 3.5.11

WT-2309       Add yields and/or sleeps in #DIAGNOSTIC mode
WT-3047       Add mode aimed at uncovering race conditions in split code
WT-3308       Add statistics tracking around yield loops
WT-3316       Add new engineering section to reference guide documentation
WT-3338       Optimize cursor modify
WT-3380       Special case 8-byte timestamps
WT-3387       Add support for a stable timestamp
WT-3389       Restructure split code to hold a split generation for the entire operation.
WT-3406       Reconciliation is choosing reserved records for writing.
WT-3410       Add developer documentation for table rename
WT-3412       Add backoff logic to the btree delete and walk yield loops
WT-3418       block manager object race
WT-3422       WiredTiger upgrading documents out of date
WT-3432       workgen needs braces around an "if" body
WT-3433       session->alter method should not be supported in read-only mode
WT-3439       lint/cleanup
WT-3440       Add a log record when starting a checkpoint
WT-3442       Coverity 1378213: false positive on diagnostic assignment.
WT-3446       Temporarily disable timestamp testing in test/checkpoint
WT-3447       test_stat_log02 can assert before table stats are printed
WT-3461       Avoid long sleeps when the system clock is adjusted
WT-3463       Add recovery of backup to test_timestamp03.py
WT-3466       Track the first commit timestamp for each transaction
WT-3467       Minor lint/cleanup

1 files changed, 4 insertions, 0 deletions

diff --git a/src/third_party/wiredtiger/src/conn/conn_log.c b/src/third_party/wiredtiger/src/conn/conn_log.c
index a6290e4ed92..fdf9bc8627e 100644
--- a/src/third_party/wiredtiger/src/conn/conn_log.c
+++ b/src/third_party/wiredtiger/src/conn/conn_log.c
@@ -484,6 +484,7 @@ __log_file_server(void *arg)
 	WT_LOG *log;
 	WT_LSN close_end_lsn, min_lsn;
 	WT_SESSION_IMPL *session;
+	uint64_t yield_count;
 	uint32_t filenum;
 	bool locked;
 
@@ -491,6 +492,7 @@ __log_file_server(void *arg)
 	conn = S2C(session);
 	log = conn->log;
 	locked = false;
+	yield_count = 0;
 	while (F_ISSET(conn, WT_CONN_SERVER_LOG)) {
 		/*
 		 * If there is a log file to close, make sure any outstanding
@@ -619,6 +621,7 @@ __log_file_server(void *arg)
 				 * thread a chance to run and try again in
 				 * this case.
 				 */
+				yield_count++;
 				__wt_yield();
 				continue;
 			}
@@ -631,6 +634,7 @@ __log_file_server(void *arg)
 	if (0) {
 err:		WT_PANIC_MSG(session, ret, "log close server error");
 	}
+	WT_STAT_CONN_INCRV(session, log_server_sync_blocked, yield_count);
 	if (locked)
 		__wt_spin_unlock(session, &log->log_sync_lock);
 	return (WT_THREAD_RET_VALUE);