From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH 04/17] recovery: recovery_open_log -- don't throw exception Date: Tue, 28 Apr 2020 19:11:24 +0300 [thread overview] Message-ID: <20200428161137.20536-5-gorcunov@gmail.com> (raw) In-Reply-To: <20200428161137.20536-1-gorcunov@gmail.com> Prepare for transition to plain C. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/recovery.cc | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/box/recovery.cc b/src/box/recovery.cc index 16e38cee2..55d89903f 100644 --- a/src/box/recovery.cc +++ b/src/box/recovery.cc @@ -162,17 +162,18 @@ recovery_close_log(struct recovery *r) return 0; } -static void +static int recovery_open_log(struct recovery *r, const struct vclock *vclock) { - XlogGapError *e; struct xlog_meta meta = r->cursor.meta; enum xlog_cursor_state state = r->cursor.state; + int rc = 0; if (recovery_close_log(r) != 0) - diag_raise(); + return -1; - xdir_open_cursor_xc(&r->wal_dir, vclock_sum(vclock), &r->cursor); + if (xdir_open_cursor(&r->wal_dir, vclock_sum(vclock), &r->cursor) != 0) + return -1; if (state == XLOG_CURSOR_NEW && vclock_compare(vclock, &r->vclock) > 0) { @@ -205,15 +206,16 @@ recovery_open_log(struct recovery *r, const struct vclock *vclock) */ if (vclock_compare(&r->vclock, vclock) < 0) vclock_copy(&r->vclock, vclock); - return; + return rc; gap_error: - e = tnt_error(XlogGapError, &r->vclock, vclock); - if (!r->wal_dir.force_recovery) - throw e; - /* Ignore missing WALs if force_recovery is set. */ - e->log(); - say_warn("ignoring a gap in LSN"); + diag_set(XlogGapError, &r->vclock, vclock); + if (r->wal_dir.force_recovery) { + diag_log(); + say_warn("ignoring a gap in LSN"); + } else { + rc = -1; + } goto out; } @@ -345,7 +347,8 @@ recover_remaining_wals(struct recovery *r, struct xstream *stream, continue; } - recovery_open_log(r, clock); + if (recovery_open_log(r, clock) != 0) + diag_raise(); say_info("recover from `%s'", r->cursor.name); -- 2.20.1
next prev parent reply other threads:[~2020-04-28 16:12 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-28 16:11 [Tarantool-patches] [PATCH 00/17] recovery: move from cxx to c code Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 01/17] recovery: do not call recovery_stop_local inside recovery_delete Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 02/17] recovery: convert WalSubscription class to structure Cyrill Gorcunov 2020-05-03 18:42 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 03/17] recovery: recovery_close_log -- don't throw exception Cyrill Gorcunov 2020-05-03 18:43 ` Vladislav Shpilevoy 2020-04-28 16:11 ` Cyrill Gorcunov [this message] 2020-05-03 18:43 ` [Tarantool-patches] [PATCH 04/17] recovery: recovery_open_log " Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 05/17] recovery: recover_xlog " Cyrill Gorcunov 2020-05-03 18:44 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 06/17] recovery: recover_remaining_wals " Cyrill Gorcunov 2020-05-03 18:44 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 07/17] recovery: hot_standby_f " Cyrill Gorcunov 2020-05-03 18:45 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 08/17] recovery: recovery_follow_local " Cyrill Gorcunov 2020-05-03 18:46 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 09/17] recovery: recovery_new " Cyrill Gorcunov 2020-05-03 18:47 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 10/17] recovery: recovery_scan " Cyrill Gorcunov 2020-05-03 18:47 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 11/17] recovery: recovery_finalize " Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 12/17] recovery: recovery_stop_local " Cyrill Gorcunov 2020-05-03 18:47 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 13/17] recovery: cxx to c transition Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 14/17] recovery: drop redundant type_XlogGapError Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 15/17] recovery: provide throwable wrappers Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 16/17] box: use _xc helpers of recovery code Cyrill Gorcunov 2020-05-03 18:47 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 17/17] relay: use _xc recovery helpers Cyrill Gorcunov 2020-04-28 16:24 ` [Tarantool-patches] [PATCH 01/17] recovery: do not call recovery_stop_local inside recovery_delete Cyrill Gorcunov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200428161137.20536-5-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 04/17] recovery: recovery_open_log -- don'\''t throw exception' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox