From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH 05/17] recovery: recover_xlog -- don't throw exception Date: Tue, 28 Apr 2020 19:11:25 +0300 [thread overview] Message-ID: <20200428161137.20536-6-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 | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/src/box/recovery.cc b/src/box/recovery.cc index 55d89903f..f724600ed 100644 --- a/src/box/recovery.cc +++ b/src/box/recovery.cc @@ -243,25 +243,28 @@ recovery_delete(struct recovery *r) * The reading will be stopped on reaching stop_vclock. * Use NULL for boundless recover */ -static void +static int recover_xlog(struct recovery *r, struct xstream *stream, const struct vclock *stop_vclock) { + bool force_recovery = r->wal_dir.force_recovery; struct xrow_header row; uint64_t row_count = 0; - while (xlog_cursor_next_xc(&r->cursor, &row, - r->wal_dir.force_recovery) == 0) { + int rc; + + while ((rc = xlog_cursor_next(&r->cursor, &row, force_recovery)) == 0) { /* * Read the next row from xlog file. * - * xlog_cursor_next_xc() returns 1 when + * xlog_cursor_next() returns 1 when * it can not read more rows. This doesn't mean * the file is fully read: it's fully read only * when EOF marker has been read, see i.eof_read */ if (stop_vclock != NULL && r->vclock.signature >= stop_vclock->signature) - return; + return 0; + int64_t current_lsn = vclock_get(&r->vclock, row.replica_id); if (row.lsn <= current_lsn) continue; /* already applied, skip */ @@ -272,6 +275,7 @@ recover_xlog(struct recovery *r, struct xstream *stream, * are signed with a zero replica id. */ assert(row.replica_id != 0 || row.group_id == GROUP_LOCAL); + /* * We can promote the vclock either before or * after xstream_write(): it only makes any impact @@ -281,18 +285,24 @@ recover_xlog(struct recovery *r, struct xstream *stream, vclock_follow_xrow(&r->vclock, &row); if (xstream_write(stream, &row) == 0) { ++row_count; - if (row_count % 100000 == 0) + if (row_count % 100000 == 0) { say_info("%.1fM rows processed", row_count / 1000000.); - } else { - if (!r->wal_dir.force_recovery) - diag_raise(); + } + continue; + } - say_error("skipping row {%u: %lld}", - (unsigned)row.replica_id, (long long)row.lsn); - diag_log(); + if (!force_recovery) { + rc = -1; + break; } + + say_error("skipping row {%u: %lld}", + (unsigned)row.replica_id, (long long)row.lsn); + diag_log(); } + + return rc; } /** @@ -353,7 +363,8 @@ recover_remaining_wals(struct recovery *r, struct xstream *stream, say_info("recover from `%s'", r->cursor.name); recover_current_wal: - recover_xlog(r, stream, stop_vclock); + if (recover_xlog(r, stream, stop_vclock) < 0) + diag_raise(); } if (xlog_cursor_is_eof(&r->cursor)) { -- 2.20.1
next prev parent reply other threads:[~2020-04-28 16:13 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 ` [Tarantool-patches] [PATCH 04/17] recovery: recovery_open_log " Cyrill Gorcunov 2020-05-03 18:43 ` Vladislav Shpilevoy 2020-04-28 16:11 ` Cyrill Gorcunov [this message] 2020-05-03 18:44 ` [Tarantool-patches] [PATCH 05/17] recovery: recover_xlog " 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-6-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 05/17] recovery: recover_xlog -- 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