diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2021-04-22 09:42:48 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-04-22 00:29:31 +0000 |
| commit | a73671c2597429aaed26251bd6dc4a35f40b41a2 (patch) | |
| tree | d088f54abb819fafd8ee1dea29ca3e4da61611b2 /src/third_party/wiredtiger/src/log/log.c | |
| parent | ce33b7c241aa957ac2dd3e5b073532b5a9c4ee0e (diff) | |
| download | mongo-a73671c2597429aaed26251bd6dc4a35f40b41a2.tar.gz | |
Import wiredtiger: 19af50ae16f2047c580ab4d3d292475a8a4b8c22 from branch mongodb-5.0
ref: ba88c91101..19af50ae16
for: 5.0.0
WT-7133 Fix bug in stat collection when target pages are reduced due to high HS cache pressure
WT-7365 Change the configuration file format
WT-7373 Improve slow random cursor operations on oplog
WT-7410 Split session flags into two to accommodate more session flags in future
Diffstat (limited to 'src/third_party/wiredtiger/src/log/log.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/log/log.c | 8 |
1 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 9a2632da7c9..e95dde65807 100644 --- a/src/third_party/wiredtiger/src/log/log.c +++ b/src/third_party/wiredtiger/src/log/log.c @@ -157,7 +157,7 @@ __log_wait_for_earlier_slot(WT_SESSION_IMPL *session, WT_LOGSLOT *slot) * If we're on a locked path and the write LSN is not advancing, unlock in case an earlier * thread is trying to switch its slot and complete its operation. */ - if (F_ISSET(session, WT_SESSION_LOCKED_SLOT)) + if (FLD_ISSET(session->lock_flags, WT_SESSION_LOCKED_SLOT)) __wt_spin_unlock(session, &log->log_slot_lock); /* * This may not be initialized if we are starting at an older log file version. So only @@ -169,7 +169,7 @@ __log_wait_for_earlier_slot(WT_SESSION_IMPL *session, WT_LOGSLOT *slot) __wt_yield(); else __wt_cond_wait(session, log->log_write_cond, 200, NULL); - if (F_ISSET(session, WT_SESSION_LOCKED_SLOT)) + if (FLD_ISSET(session->lock_flags, WT_SESSION_LOCKED_SLOT)) __wt_spin_lock(session, &log->log_slot_lock); } } @@ -1129,7 +1129,7 @@ __log_newfile(WT_SESSION_IMPL *session, bool conn_open, bool *created) * write to the log. If the log file size is small we could fill a log file before the previous * one is closed. Wait for that to close. */ - WT_ASSERT(session, F_ISSET(session, WT_SESSION_LOCKED_SLOT)); + WT_ASSERT(session, FLD_ISSET(session->lock_flags, WT_SESSION_LOCKED_SLOT)); for (yield_cnt = 0; log->log_close_fh != NULL;) { WT_STAT_CONN_INCR(session, log_close_yields); /* @@ -1334,7 +1334,7 @@ __wt_log_acquire(WT_SESSION_IMPL *session, uint64_t recsize, WT_LOGSLOT *slot) * the release LSN. That way when log files switch, we're waiting for the correct LSN from * outstanding writes. */ - WT_ASSERT(session, F_ISSET(session, WT_SESSION_LOCKED_SLOT)); + WT_ASSERT(session, FLD_ISSET(session->lock_flags, WT_SESSION_LOCKED_SLOT)); /* * We need to set the release LSN earlier, before a log file change. */ |