From: Vladimir Davydov <vdavydov.dev@gmail.com> To: Sergei Voronezhskii <sergw@tarantool.org> Cc: tarantool-patches@freelists.org Subject: Re: [PATCH v3 2/5] test: errinj for pause relay_send Date: Thu, 6 Dec 2018 18:44:14 +0300 [thread overview] Message-ID: <20181206154414.ej26xggkyxdk42gq@esperanza> (raw) In-Reply-To: <20181206133852.75633-3-sergw@tarantool.org> On Thu, Dec 06, 2018 at 04:38:49PM +0300, Sergei Voronezhskii wrote: > diff --git a/src/box/relay.cc b/src/box/relay.cc > index 0034f99a0..17daf76bf 100644 > --- a/src/box/relay.cc > +++ b/src/box/relay.cc > @@ -635,12 +635,17 @@ relay_subscribe(struct replica *replica, int fd, uint64_t sync, > static void > relay_send(struct relay *relay, struct xrow_header *packet) > { > + struct errinj *inj = errinj(ERRINJ_RELAY_SEND_DELAY, ERRINJ_BOOL); > + while (inj != NULL && inj->bparam) { > + fiber_sleep(0.01); > + inj = errinj(ERRINJ_RELAY_SEND_DELAY, ERRINJ_BOOL); > + } No need to update 'inj' here. I removed this line. > @@ -304,11 +331,14 @@ box.snapshot() > --- > - ok > ... > -#box.info.gc().checkpoints == 1 or box.info.gc() > +wait_gc(1) or box.info.gc() > --- > - true > ... > -#fio.glob('./master/*.xlog') == 2 or fio.listdir('./master') ^^^^^^ 2 > +-- The replica may have managed to download all data > +-- from xlog #1 before it was stopped, in which case > +-- it's OK to collect xlog #1. > +wait_xlog({2, 3}) or fio.listdir('./master') ^^^^^^ 2 or 3 If you did the rebase more thoroughly, you'd notice that now there can't be 3 xlogs here, only 2. I fixed it (removed value_in; made wait_xlog always take a number). Anyway, all this refactoring (I mean wait_xlog, wait_gc helpers) doesn't have anything to do with the goal pursued by this patch. I left it as is for now, but in future please avoid squashing gratuitous changes in your patches - this complicates review.
next prev parent reply other threads:[~2018-12-06 15:44 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-16 8:58 [PATCH] test: update test-run Sergei Voronezhskii 2018-11-16 9:27 ` Alexander Turenko 2018-11-16 13:58 ` Re[2]: " Sergei Voronezhskii 2018-11-16 15:41 ` Alexander Turenko 2018-11-26 11:18 ` Re[2]: " Sergei Voronezhskii 2018-11-26 11:27 ` Alexander Turenko 2018-12-04 8:33 ` Re[2]: " Сергей Воронежский 2018-12-06 9:33 ` Re[3]: " Сергей Воронежский 2018-12-06 13:38 ` [PATCH v3 0/5] enable parallel mode for replication tests Sergei Voronezhskii 2018-12-06 13:38 ` [PATCH v3 1/5] test: cleanup " Sergei Voronezhskii 2018-12-06 13:38 ` [PATCH v3 2/5] test: errinj for pause relay_send Sergei Voronezhskii 2018-12-06 15:44 ` Vladimir Davydov [this message] 2018-12-06 13:38 ` [PATCH v3 3/5] test: put require in proper places Sergei Voronezhskii 2018-12-06 13:38 ` [PATCH v3 4/5] test: use wait_cond to check follow status Sergei Voronezhskii 2018-12-06 13:38 ` [PATCH v3 5/5] test: replication parallel mode on Sergei Voronezhskii 2018-12-06 15:44 ` [PATCH v3 0/5] enable parallel mode for replication tests Vladimir Davydov 2018-12-18 23:47 ` Re[3]: [PATCH] test: update test-run Сергей Воронежский 2018-12-19 9:00 ` Vladimir Davydov
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=20181206154414.ej26xggkyxdk42gq@esperanza \ --to=vdavydov.dev@gmail.com \ --cc=sergw@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [PATCH v3 2/5] test: errinj for pause relay_send' \ /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