From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: Cyrill Gorcunov <gorcunov@gmail.com>, tml <tarantool-patches@dev.tarantool.org> Subject: Re: [Tarantool-patches] [PATCH 10/17] recovery: recovery_scan -- don't throw exception Date: Sun, 3 May 2020 20:47:15 +0200 [thread overview] Message-ID: <8aeb8544-a3d9-72cf-3652-eafe5c80528b@tarantool.org> (raw) In-Reply-To: <20200428161137.20536-11-gorcunov@gmail.com> Thanks for the patch! See 2 comments below. > diff --git a/src/box/recovery.cc b/src/box/recovery.cc > index 1c7665f87..af7910bdf 100644 > --- a/src/box/recovery.cc > +++ b/src/box/recovery.cc > @@ -134,12 +135,19 @@ recovery_scan(struct recovery *r, struct vclock *end_vclock, > > /* Scan the last xlog to find end vclock. */ > struct xlog_cursor cursor; > - if (xdir_open_cursor(&r->wal_dir, vclock_sum(end_vclock), &cursor) != 0) > - return; > + if (xdir_open_cursor(&r->wal_dir, vclock_sum(end_vclock), &cursor) != 0) { 1. This becomes out of 80 symbols now. I propose to wrap '&cursor' on the next line. > + /* > + * FIXME: Why do we ignore errors?! 2. Since we are talking about this, we also skip xlog_cursor_next() returning -1 below. > + */ > + return 0; > + } > + > struct xrow_header row; > while (xlog_cursor_next(&cursor, &row, true) == 0) > vclock_follow_xrow(end_vclock, &row); > + > xlog_cursor_close(&cursor, false); > + return 0; > }
next prev parent reply other threads:[~2020-05-03 18:47 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 ` [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 [this message] 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=8aeb8544-a3d9-72cf-3652-eafe5c80528b@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 10/17] recovery: recovery_scan -- 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