diff options
| author | Dan Pasette <dan@10gen.com> | 2015-01-28 11:56:01 -0500 |
|---|---|---|
| committer | Dan Pasette <dan@mongodb.com> | 2015-01-28 11:56:01 -0500 |
| commit | 83681b826fbe4da459924536f037dfa652eea543 (patch) | |
| tree | aac534386fa186295c57ac2052ab545e69235290 /src/third_party | |
| parent | 091f56d3b73453197acfca1f074aa5eab0c49ab6 (diff) | |
| download | mongo-83681b826fbe4da459924536f037dfa652eea543.tar.gz | |
Import wiredtiger-wiredtiger-mongodb-2.8-rc6-54-g1077219.tar.gz from wiredtiger branch mongodb-2.8
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/wiredtiger/src/log/log.c | 4 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/log/log_slot.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/log/log.c b/src/third_party/wiredtiger/src/log/log.c index 5e1256aec07..cf6d011571f 100644 --- a/src/third_party/wiredtiger/src/log/log.c +++ b/src/third_party/wiredtiger/src/log/log.c @@ -881,11 +881,11 @@ __log_release(WT_SESSION_IMPL *session, WT_LOGSLOT *slot) * in the log file. */ while (LOG_CMP(&log->write_lsn, &slot->slot_release_lsn) != 0) { - if (++yield_count < 100) + if (++yield_count < 1000) __wt_yield(); else WT_ERR(__wt_cond_wait( - session, log->log_write_cond, 2000)); + session, log->log_write_cond, 200)); } log->write_lsn = slot->slot_end_lsn; WT_ERR(__wt_cond_signal(session, log->log_write_cond)); diff --git a/src/third_party/wiredtiger/src/log/log_slot.c b/src/third_party/wiredtiger/src/log/log_slot.c index 611587aaa8e..ff61afb698c 100644 --- a/src/third_party/wiredtiger/src/log/log_slot.c +++ b/src/third_party/wiredtiger/src/log/log_slot.c @@ -266,10 +266,10 @@ __wt_log_slot_wait(WT_SESSION_IMPL *session, WT_LOGSLOT *slot) WT_UNUSED(session); while (slot->slot_state > WT_LOG_SLOT_DONE) - if (++yield_count < 100) + if (++yield_count < 1000) __wt_yield(); else - __wt_sleep(0, 2000); + __wt_sleep(0, 200); return (0); } |