summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2016-01-20 19:22:38 -0500
committerKeith Bostic <keith@wiredtiger.com>2016-01-20 19:22:38 -0500
commit805a935460accad60469265f04a3076c8df9e0a3 (patch)
tree2fc689ffac4126c75f806c50333f478c5b74ebc5
parent74ee4bf742f2996c993b8758a0fcaaeaccf95ebc (diff)
downloadmongo-805a935460accad60469265f04a3076c8df9e0a3.tar.gz
WT-2340: Add logging guarantee assertions, whitespace
-rw-r--r--src/conn/conn_log.c3
-rw-r--r--src/log/log.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/conn/conn_log.c b/src/conn/conn_log.c
index 50ad688efac..3b5e8039fb4 100644
--- a/src/conn/conn_log.c
+++ b/src/conn/conn_log.c
@@ -678,7 +678,8 @@ __log_wrlsn_server(void *arg)
if (yield++ < WT_THOUSAND)
__wt_yield();
else
- WT_ERR(__wt_cond_wait(session, conn->log_wrlsn_cond, 10000));
+ WT_ERR(__wt_cond_wait(
+ session, conn->log_wrlsn_cond, 10000));
}
/*
* On close we need to do this one more time because there could
diff --git a/src/log/log.c b/src/log/log.c
index 82fa0741428..c435d64cb9e 100644
--- a/src/log/log.c
+++ b/src/log/log.c
@@ -1971,7 +1971,8 @@ err:
ret = myslot.slot->slot_error;
/*
- * If one of the sync flags is set, assert the proper LSN has moved to match.
+ * If one of the sync flags is set, assert the proper LSN has moved to
+ * match.
*/
WT_ASSERT(session, !LF_ISSET(WT_LOG_FLUSH) ||
__wt_log_cmp(&log->write_lsn, &lsn) >= 0);