diff options
author | Luke Chen <luke.chen@mongodb.com> | 2020-05-06 15:07:08 +1000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-05-06 05:38:19 +0000 |
commit | a6c22550e323e628b7e16ea6e9b4d272de62c18e (patch) | |
tree | ba4b0e25c9717bac0d7eb316761b6f461573425d /src/third_party/wiredtiger/src/log/log.c | |
parent | 950dd1ff0ce5d62bbd434e8b874cce2ecbbda3ee (diff) | |
download | mongo-a6c22550e323e628b7e16ea6e9b4d272de62c18e.tar.gz |
Import wiredtiger: 18dfb9e58e39927696affcd8e362364e23e1aa59 from branch mongodb-4.4
ref: a707df12a2..18dfb9e58e
for: 4.5.1
WT-5242 Minimize checkpoints pinned during backup
WT-5470 Reduce copies and allocations in read path
WT-5673 Prepare support with durable history: modify verify and salvage as needed
WT-5677 Prepare support with durable history: add test/format stress tests
WT-5710 Review WT_PANIC usage
WT-5716 Create the history store file at the same time as creating the metadata file in wiredtiger open
WT-5839 Ignore non-globally visible tombstones for both data store and hs store in hs verification
WT-5841 Return WT_TRY_SALVAGE when the history file is removed or truncated
WT-5928 Cleanup stale FIXMEs from durable history
WT-5977 WT_SESSION_NO_RECONCILE flag set by history cursor prevents eviction
WT-5984 Allow prepared updates to be evicted in durable history
WT-6009 Prepare support with durable history: add statistic for prepared updates evicted
WT-6032 Turn on mongodb-4.4 branch upgrade/downgrade testing
WT-6051 Fix reconstructing full value from modifies for string format
WT-6068 Re-enable tests temporarily disabled during durable history development
WT-6069 Remove WT_UPDATE_RESTORED_FROM_DISK flag
WT-6070 Coverity : Copy paste error
WT-6071 Coverity : Change format specifier
WT-6086 Move time windows and aggregated time windows into structures
WT-6087 Add a C2S(cursor) macro to simplify translation from a cursor to a session.
WT-6095 Verify on-disk page only for row store as part of rollback to stable
WT-6109 Cleanup usage of cursor->session
WT-6110 Cleanup cast from cbt to cursor
WT-6120 Remove use-after-free in __verify_history_store_id
WT-6130 Disable test_random_abort
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 87e4bda2a8a..e8348fb9933 100644 --- a/src/third_party/wiredtiger/src/log/log.c +++ b/src/third_party/wiredtiger/src/log/log.c @@ -215,7 +215,7 @@ __log_fs_write( } __wt_capacity_throttle(session, len, WT_THROTTLE_LOG); if ((ret = __wt_write(session, slot->slot_fh, offset, len, buf)) != 0) - WT_PANIC_RET(session, ret, "%s: fatal log failure", slot->slot_fh->name); + WT_RET_PANIC(session, ret, "%s: fatal log failure", slot->slot_fh->name); return (ret); } @@ -1166,7 +1166,7 @@ __log_newfile(WT_SESSION_IMPL *session, bool conn_open, bool *created) * can copy the files in any way they choose, and a log file rename might confuse things. */ create_log = true; - if (conn->log_prealloc > 0 && !conn->hot_backup) { + if (conn->log_prealloc > 0 && conn->hot_backup_start == 0) { WT_WITH_HOTBACKUP_READ_LOCK( session, ret = __log_alloc_prealloc(session, log->fileid), &skipp); @@ -1194,7 +1194,7 @@ __log_newfile(WT_SESSION_IMPL *session, bool conn_open, bool *created) * Increment the missed pre-allocated file counter only if a hot backup is not in progress. * We are deliberately not using pre-allocated log files during backup (see comment above). */ - if (!conn->hot_backup) + if (conn->hot_backup_start == 0) log->prep_missed++; WT_RET(__wt_log_allocfile(session, log->fileid, WT_LOG_FILENAME)); } @@ -1383,7 +1383,7 @@ __log_truncate_file(WT_SESSION_IMPL *session, WT_FH *log_fh, wt_off_t offset) conn = S2C(session); log = conn->log; - if (!F_ISSET(log, WT_LOG_TRUNCATE_NOTSUP) && !conn->hot_backup) { + if (!F_ISSET(log, WT_LOG_TRUNCATE_NOTSUP) && conn->hot_backup_start == 0) { WT_WITH_HOTBACKUP_READ_LOCK(session, ret = __wt_ftruncate(session, log_fh, offset), &skipp); if (!skipp) { if (ret != ENOTSUP) |