From: Georgy Kirichenko <georgy@tarantool.org> To: tarantool-patches@freelists.org Cc: Georgy Kirichenko <georgy@tarantool.org> Subject: [tarantool-patches] [PATCH v3 07/14] wal: remove fiber from a journal_entry structure Date: Sun, 9 Jun 2019 23:44:36 +0300 [thread overview] Message-ID: <ca4cf6c02769f806d35d9e7074d9959fb73ba82a.1560112747.git.georgy@tarantool.org> (raw) In-Reply-To: <cover.1560112747.git.georgy@tarantool.org> Use a fiber_cond to signal a condition and wake up a waiting fiber. This relaxes friction between fiber and transaction life cycles. Prerequisites: #1254 --- src/box/box.cc | 4 +++- src/box/journal.c | 7 ++++--- src/box/journal.h | 9 +++++++-- src/box/wal.c | 29 +++++++++-------------------- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index 5e5cd2b08..a88e762c0 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -309,9 +309,11 @@ struct recovery_journal { */ static int64_t recovery_journal_write(struct journal *base, - struct journal_entry * /* entry */) + struct journal_entry *entry) { struct recovery_journal *journal = (struct recovery_journal *) base; + entry->done = true; + fiber_cond_broadcast(&entry->done_cond); return vclock_sum(journal->vclock); } diff --git a/src/box/journal.c b/src/box/journal.c index fe13fb6ee..6406d6f01 100644 --- a/src/box/journal.c +++ b/src/box/journal.c @@ -30,7 +30,6 @@ */ #include "journal.h" #include <small/region.h> -#include <fiber.h> #include <diag.h> /** @@ -41,7 +40,8 @@ static int64_t dummy_journal_write(struct journal *journal, struct journal_entry *entry) { (void) journal; - (void) entry; + entry->done = true; + fiber_cond_broadcast(&entry->done_cond); return 0; } @@ -69,7 +69,8 @@ journal_entry_new(size_t n_rows, struct region *region) entry->approx_len = 0; entry->n_rows = n_rows; entry->res = -1; - entry->fiber = fiber(); + entry->done = false; + fiber_cond_create(&entry->done_cond); return entry; } diff --git a/src/box/journal.h b/src/box/journal.h index 8ac32ee5e..618c68eb2 100644 --- a/src/box/journal.h +++ b/src/box/journal.h @@ -33,6 +33,7 @@ #include <stdint.h> #include <stdbool.h> #include "salad/stailq.h" +#include "fiber_cond.h" #if defined(__cplusplus) extern "C" { @@ -55,9 +56,13 @@ struct journal_entry { */ int64_t res; /** - * The fiber issuing the request. + * Turns to true when entry is processed by wal. */ - struct fiber *fiber; + bool done; + /** + * Condition to broadcast when processing is done. + */ + struct fiber_cond done_cond; /** * Approximate size of this request when encoded. */ diff --git a/src/box/wal.c b/src/box/wal.c index 0ea15a432..5951817d0 100644 --- a/src/box/wal.c +++ b/src/box/wal.c @@ -246,22 +246,16 @@ xlog_write_entry(struct xlog *l, struct journal_entry *entry) } /** - * Invoke fibers waiting for their journal_entry's to be - * completed. The fibers are invoked in strict fifo order: - * this ensures that, in case of rollback, requests are - * rolled back in strict reverse order, producing - * a consistent database state. + * Signal done condition. */ static void tx_schedule_queue(struct stailq *queue) { - /* - * fiber_wakeup() is faster than fiber_call() when there - * are many ready fibers. - */ struct journal_entry *req; - stailq_foreach_entry(req, queue, fifo) - fiber_wakeup(req->fiber); + stailq_foreach_entry(req, queue, fifo) { + req->done = true; + fiber_cond_broadcast(&req->done_cond); + } } /** @@ -1172,15 +1166,10 @@ wal_write(struct journal *journal, struct journal_entry *entry) batch->approx_len += entry->approx_len; writer->wal_pipe.n_input += entry->n_rows * XROW_IOVMAX; cpipe_flush_input(&writer->wal_pipe); - /** - * It's not safe to spuriously wakeup this fiber - * since in that case it will ignore a possible - * error from WAL writer and not roll back the - * transaction. - */ - bool cancellable = fiber_set_cancellable(false); - fiber_yield(); /* Request was inserted. */ - fiber_set_cancellable(cancellable); + + while (!entry->done) + fiber_cond_wait(&entry->done_cond); + return entry->res; } -- 2.21.0
next prev parent reply other threads:[~2019-06-09 20:44 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-09 20:44 [tarantool-patches] [PATCH v3 00/14] Parallel applier Georgy Kirichenko 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 01/14] txn: Fire a trigger after a transaction finalization Georgy Kirichenko 2019-06-09 21:59 ` [tarantool-patches] " Konstantin Osipov 2019-06-11 11:42 ` [tarantool-patches] " Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 02/14] ddl: synchronize privileges cache with actual data state Georgy Kirichenko 2019-06-11 13:13 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 03/14] txn: transaction memory allocation Georgy Kirichenko 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 04/14] ddl: place alter structures onto a txn memory region Georgy Kirichenko 2019-06-11 14:14 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 05/14] txn: get rid of autocommit from a txn structure Georgy Kirichenko 2019-06-13 14:11 ` Vladimir Davydov 2019-06-16 16:20 ` [tarantool-patches] " Konstantin Osipov 2019-06-16 16:14 ` Konstantin Osipov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 06/14] txn: get rid of fiber_gc from txn_rollback Georgy Kirichenko 2019-06-13 14:12 ` Vladimir Davydov 2019-06-13 19:28 ` Георгий Кириченко 2019-06-14 9:21 ` Vladimir Davydov 2019-06-16 16:38 ` [tarantool-patches] " Konstantin Osipov 2019-06-09 20:44 ` Georgy Kirichenko [this message] 2019-06-13 14:17 ` [tarantool-patches] [PATCH v3 07/14] wal: remove fiber from a journal_entry structure Vladimir Davydov 2019-06-13 19:33 ` Георгий Кириченко 2019-06-14 8:05 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 08/14] wal: enable asyncronous wal writes Georgy Kirichenko 2019-06-13 14:21 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 09/14] wal: a dedicated wal scheduling fiber Georgy Kirichenko 2019-06-13 14:24 ` Vladimir Davydov 2019-06-13 19:36 ` Георгий Кириченко 2019-06-14 9:20 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 10/14] core: latch_unlock_external routine Georgy Kirichenko 2019-06-13 14:27 ` Vladimir Davydov 2019-06-13 19:38 ` Георгий Кириченко 2019-06-14 8:10 ` Vladimir Davydov 2019-06-14 9:18 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 11/14] txn: introduce asynchronous txn commit Georgy Kirichenko 2019-06-13 14:34 ` Vladimir Davydov 2019-06-13 19:45 ` Георгий Кириченко 2019-06-14 7:58 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 12/14] txn: handle fiber stop event at transaction level Georgy Kirichenko 2019-06-13 14:36 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 13/14] applier: apply transaction in parallel Georgy Kirichenko 2019-06-13 15:17 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 14/14] 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=ca4cf6c02769f806d35d9e7074d9959fb73ba82a.1560112747.git.georgy@tarantool.org \ --to=georgy@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v3 07/14] wal: remove fiber from a journal_entry structure' \ /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