diff options
| author | Will Korteland <will.korteland@mongodb.com> | 2023-01-10 03:01:59 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-01-10 03:37:44 +0000 |
| commit | bc7e2f3f5a4d7825b67f81443c06f1da49e92c55 (patch) | |
| tree | efe85c3394c3f43f892eb986c1843860151c8580 /src/third_party/wiredtiger/src/block/block_ckpt.c | |
| parent | 3cbd5db4b876195f77eec0051a3529d6f952ef3f (diff) | |
| download | mongo-bc7e2f3f5a4d7825b67f81443c06f1da49e92c55.tar.gz | |
Import wiredtiger: 5ee7a7e67038b293d1069a215875a78075b07fd7 from branch mongodb-master
ref: c4afe2835c..5ee7a7e670
for: 6.3.0-rc0
WT-10468 Enable WT Assertions in Release Mode
Diffstat (limited to 'src/third_party/wiredtiger/src/block/block_ckpt.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/block/block_ckpt.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/third_party/wiredtiger/src/block/block_ckpt.c b/src/third_party/wiredtiger/src/block/block_ckpt.c index 55138f2f4ea..763e5d5076c 100644 --- a/src/third_party/wiredtiger/src/block/block_ckpt.c +++ b/src/third_party/wiredtiger/src/block/block_ckpt.c @@ -72,8 +72,8 @@ __wt_block_checkpoint_load(WT_SESSION_IMPL *session, WT_BLOCK *block, const uint live_open = block->live_open; block->live_open = true; __wt_spin_unlock(session, &block->live_lock); - WT_ERR_ASSERT( - session, live_open == false, EBUSY, "%s: attempt to re-open live file", block->name); + WT_ERR_ASSERT(session, WT_DIAG_CONCURRENT_ACCESS, live_open == false, EBUSY, + "%s: attempt to re-open live file", block->name); ci = &block->live; WT_ERR(__wt_block_ckpt_init(session, ci, "live")); @@ -319,7 +319,6 @@ __ckpt_extlist_fblocks(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_EXTLIST *el return (__wt_block_insert_ext(session, block, &block->live.ckpt_avail, el->offset, el->size)); } -#ifdef HAVE_DIAGNOSTIC /* * __ckpt_verify -- * Diagnostic code, confirm we get what we expect in the checkpoint array. @@ -350,7 +349,6 @@ __ckpt_verify(WT_SESSION_IMPL *session, WT_CKPT *ckptbase) } return (0); } -#endif /* * __ckpt_add_blkmod_entry -- @@ -488,9 +486,8 @@ __ckpt_process(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_CKPT *ckptbase) ci = &block->live; fatal = locked = false; -#ifdef HAVE_DIAGNOSTIC - WT_RET(__ckpt_verify(session, ckptbase)); -#endif + if (EXTRA_DIAGNOSTICS_ENABLED(session, WT_DIAG_DATA_VALIDATION)) + WT_RET(__ckpt_verify(session, ckptbase)); /* * Checkpoints are a two-step process: first, write a new checkpoint to disk (including all the @@ -584,7 +581,7 @@ __ckpt_process(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_CKPT *ckptbase) */ if (next_ckpt->bpriv == NULL && !F_ISSET(next_ckpt, WT_CKPT_ADD)) { WT_ERR(__ckpt_extlist_read(session, block, next_ckpt, &local)); - WT_ERR_ASSERT(session, local == true, WT_PANIC, + WT_ERR_ASSERT(session, WT_DIAG_INVALID_OP, local == true, WT_PANIC, "tiered storage checkpoint follows local checkpoint"); } } |