From: Vladimir Davydov <vdavydov.dev@gmail.com> To: Georgy Kirichenko <georgy@tarantool.org> Cc: tarantool-patches@freelists.org Subject: Re: [tarantool-patches] [PATCH v4 4/9] txn: get rid of fiber_gc from txn_rollback Date: Thu, 20 Jun 2019 16:03:52 +0300 [thread overview] Message-ID: <20190620130352.q763jjpvkusujtq4@esperanza> (raw) In-Reply-To: <0eeb7c2b0e45bfae1cba4488292c7d6fc7e69fa4.1560978655.git.georgy@tarantool.org> On Thu, Jun 20, 2019 at 12:23:11AM +0300, Georgy Kirichenko wrote: > Don't touch a fiber gc storage on a transaction rollback explicitly. > This relaxes dependencies between fiber and transaction life cycles. > > Prerequisites: #1254 > --- > src/box/applier.cc | 8 +++++--- > src/box/box.cc | 14 +++++++++----- > src/box/call.c | 22 ++++++++++++++++------ > src/box/memtx_engine.c | 3 ++- > src/box/txn.c | 35 +++++++++++++++++------------------ > src/box/txn.h | 8 ++++++-- > src/box/vy_scheduler.c | 10 +++++++--- > 7 files changed, 62 insertions(+), 38 deletions(-) > > diff --git a/src/box/txn.c b/src/box/txn.c > index 39b1ed773..21f7e98b4 100644 > --- a/src/box/txn.c > +++ b/src/box/txn.c > @@ -168,6 +168,10 @@ txn_new() > inline static void > txn_free(struct txn *txn) > { > + struct txn_stmt *stmt; > + stailq_foreach_entry(stmt, &txn->stmts, next) > + txn_stmt_unref_tuples(stmt); > + Clearly, this doesn't belong here. Should be a part of the previous patch? > /* Truncate region up to struct txn size. */ > region_truncate(&txn->region, sizeof(struct txn)); > stailq_add(&txn_cache, &txn->in_txn_cache); > @@ -636,6 +634,7 @@ txn_on_stop(struct trigger *trigger, void *event) > { > (void) trigger; > (void) event; > - txn_rollback(); /* doesn't yield or fail */ > + txn_rollback(in_txn()); /* doesn't yield or fail */ > + Extra new line. > } > > diff --git a/src/box/txn.h b/src/box/txn.h > index 5a66f8e53..569978ce9 100644 > --- a/src/box/txn.h > +++ b/src/box/txn.h > @@ -267,6 +270,7 @@ txn_on_rollback(struct txn *txn, struct trigger *trigger) > > /** > * Start a new statement. > + * Return a new statement or NULL in case of error. Again, looks like a leftover from the prevoius patch. Other than that the patch looks fine to me. I would rather remove fiber_gc() altogether, but as Kostja pointed out, it's too risky so fine - let it be. > */ > struct txn_stmt * > txn_begin_stmt(struct txn *txn, struct space *space);
next prev parent reply other threads:[~2019-06-20 13:03 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-19 21:23 [tarantool-patches] [PATCH v4 0/9] Parallel applier Georgy Kirichenko 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 1/9] txn: handle fiber stop event at transaction level Georgy Kirichenko 2019-06-20 7:28 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 11:39 ` [tarantool-patches] " Vladimir Davydov 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 2/9] core: latch_steal routine Georgy Kirichenko 2019-06-20 7:28 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 11:53 ` [tarantool-patches] " Vladimir Davydov 2019-06-20 20:34 ` Георгий Кириченко 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 3/9] txn: get rid of autocommit from a txn structure Georgy Kirichenko 2019-06-20 7:32 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 11:52 ` [tarantool-patches] " Vladimir Davydov 2019-06-20 20:16 ` Георгий Кириченко 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 4/9] txn: get rid of fiber_gc from txn_rollback Georgy Kirichenko 2019-06-20 7:43 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 20:35 ` Георгий Кириченко 2019-06-20 13:03 ` Vladimir Davydov [this message] 2019-06-20 20:16 ` [tarantool-patches] " Георгий Кириченко 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 5/9] wal: a dedicated wal scheduling fiber Georgy Kirichenko 2019-06-20 7:53 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 13:05 ` [tarantool-patches] " Vladimir Davydov 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 6/9] wal: introduce a journal entry finalization callback Georgy Kirichenko 2019-06-20 7:56 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 14:08 ` [tarantool-patches] " Vladimir Davydov 2019-06-20 20:22 ` Георгий Кириченко 2019-06-21 7:26 ` [tarantool-patches] " Konstantin Osipov 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 7/9] txn: introduce asynchronous txn commit Georgy Kirichenko 2019-06-20 8:01 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 15:00 ` [tarantool-patches] " Vladimir Davydov 2019-06-21 7:28 ` [tarantool-patches] " Konstantin Osipov 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 8/9] applier: apply transaction in parallel Georgy Kirichenko 2019-06-20 7:41 ` [tarantool-patches] " Георгий Кириченко 2019-06-20 8:07 ` Konstantin Osipov 2019-06-20 16:37 ` Vladimir Davydov 2019-06-20 20:33 ` Георгий Кириченко 2019-06-21 8:36 ` Vladimir Davydov 2019-06-20 8:06 ` Konstantin Osipov 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 9/9] test: fix flaky test Georgy Kirichenko
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=20190620130352.q763jjpvkusujtq4@esperanza \ --to=vdavydov.dev@gmail.com \ --cc=georgy@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v4 4/9] txn: get rid of fiber_gc from txn_rollback' \ /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