diff options
Diffstat (limited to 'src/third_party/wiredtiger/src/block/block_ckpt.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/block/block_ckpt.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/third_party/wiredtiger/src/block/block_ckpt.c b/src/third_party/wiredtiger/src/block/block_ckpt.c index 6cbe80a9317..292917be5d6 100644 --- a/src/third_party/wiredtiger/src/block/block_ckpt.c +++ b/src/third_party/wiredtiger/src/block/block_ckpt.c @@ -196,11 +196,11 @@ __wt_block_checkpoint_start(WT_SESSION_IMPL *session, WT_BLOCK *block) case WT_CKPT_INPROGRESS: case WT_CKPT_PANIC_ON_FAILURE: case WT_CKPT_SALVAGE: - __wt_err(session, EINVAL, + ret = __wt_panic(session, EINVAL, "%s: an unexpected checkpoint start: the checkpoint " "has already started or was configured for salvage", block->name); - ret = __wt_block_panic(session); + __wt_block_set_readonly(session); break; case WT_CKPT_NONE: block->ckpt_state = WT_CKPT_INPROGRESS; @@ -389,11 +389,11 @@ __ckpt_process(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_CKPT *ckptbase) break; case WT_CKPT_NONE: case WT_CKPT_PANIC_ON_FAILURE: - __wt_err(session, EINVAL, + ret = __wt_panic(session, EINVAL, "%s: an unexpected checkpoint attempt: the checkpoint " "was never started or has already completed", block->name); - ret = __wt_block_panic(session); + __wt_block_set_readonly(session); break; case WT_CKPT_SALVAGE: /* Salvage doesn't use the standard checkpoint APIs. */ @@ -638,8 +638,8 @@ live_update: err: if (ret != 0 && fatal) { - __wt_err(session, ret, "%s: fatal checkpoint failure", block->name); - ret = __wt_block_panic(session); + ret = __wt_panic(session, ret, "%s: fatal checkpoint failure", block->name); + __wt_block_set_readonly(session); } if (locked) @@ -860,26 +860,26 @@ __wt_block_checkpoint_resolve(WT_SESSION_IMPL *session, WT_BLOCK *block, bool fa goto done; case WT_CKPT_NONE: case WT_CKPT_SALVAGE: - __wt_err(session, EINVAL, + ret = __wt_panic(session, EINVAL, "%s: an unexpected checkpoint resolution: the checkpoint " "was never started or completed, or configured for salvage", block->name); - ret = __wt_block_panic(session); + __wt_block_set_readonly(session); break; case WT_CKPT_PANIC_ON_FAILURE: if (!failed) break; - __wt_err( + ret = __wt_panic( session, EINVAL, "%s: the checkpoint failed, the system must restart", block->name); - ret = __wt_block_panic(session); + __wt_block_set_readonly(session); break; } WT_ERR(ret); if ((ret = __wt_block_extlist_merge(session, block, &ci->ckpt_avail, &ci->avail)) != 0) { - __wt_err( + ret = __wt_panic( session, ret, "%s: fatal checkpoint failure during extent list merge", block->name); - ret = __wt_block_panic(session); + __wt_block_set_readonly(session); } __wt_spin_unlock(session, &block->live_lock); |