From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH v13 01/11] box: recovery_journal_create -- set journal here Date: Thu, 19 Mar 2020 12:05:27 +0300 [thread overview] Message-ID: <20200319090537.5613-2-gorcunov@gmail.com> (raw) In-Reply-To: <20200319090537.5613-1-gorcunov@gmail.com> Allows to eliminate code duplication. Acked-by: Konstantin Osipov <kostja.osipov@gmail.com> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/box.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index 09dd67ab4..eb5931e37 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -331,6 +331,7 @@ recovery_journal_create(struct recovery_journal *journal, struct vclock *v) { journal_create(&journal->base, recovery_journal_write, NULL); journal->vclock = v; + journal_set(&journal->base); } static void @@ -2055,7 +2056,6 @@ bootstrap_from_master(struct replica *master) engine_begin_final_recovery_xc(); struct recovery_journal journal; recovery_journal_create(&journal, &replicaset.vclock); - journal_set(&journal.base); if (!replication_anon) { applier_resume_to_state(applier, APPLIER_JOINED, @@ -2221,7 +2221,6 @@ local_recovery(const struct tt_uuid *instance_uuid, struct recovery_journal journal; recovery_journal_create(&journal, &recovery->vclock); - journal_set(&journal.base); /* * We explicitly request memtx to recover its -- 2.20.1
next prev parent reply other threads:[~2020-03-19 9:05 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-19 9:05 [Tarantool-patches] [PATCH v13 00/11] box/journal: redesign sync and async writes Cyrill Gorcunov 2020-03-19 9:05 ` Cyrill Gorcunov [this message] 2020-03-19 9:05 ` [Tarantool-patches] [PATCH v13 02/11] box: recovery_journal -- declare it as static Cyrill Gorcunov 2020-03-19 9:05 ` [Tarantool-patches] [PATCH v13 03/11] box/txn: move fiber_set_txn to header Cyrill Gorcunov 2020-03-19 9:05 ` [Tarantool-patches] [PATCH v13 04/11] box/txn: rename txn_write to txn_commit_async Cyrill Gorcunov 2020-03-19 9:05 ` [Tarantool-patches] [PATCH v13 05/11] box/txn: move setup of txn start to txn_prepare Cyrill Gorcunov 2020-03-19 9:05 ` [Tarantool-patches] [PATCH v13 06/11] box/txn: add txn_commit_nop helper Cyrill Gorcunov 2020-03-19 9:05 ` [Tarantool-patches] [PATCH v13 07/11] box/txn: rename txn_entry_complete_cb to txn_complete_async Cyrill Gorcunov 2020-03-19 9:05 ` [Tarantool-patches] [PATCH v13 08/11] box/txn: unweave txn_commit from txn_commit_async Cyrill Gorcunov 2020-03-19 9:05 ` [Tarantool-patches] [PATCH v13 09/11] box/txn: clear fiber storage right before journal write Cyrill Gorcunov 2020-03-19 9:05 ` [Tarantool-patches] [PATCH v13 10/11] box/txn: move journal allocation into separate routine Cyrill Gorcunov 2020-03-19 9:05 ` [Tarantool-patches] [PATCH v13 11/11] box/journal: redesign journal operations Cyrill Gorcunov 2020-03-19 10:37 ` Konstantin Osipov 2020-03-19 10:49 ` Cyrill Gorcunov 2020-03-19 11:12 ` Konstantin Osipov 2020-03-19 11:17 ` Cyrill Gorcunov 2020-03-19 16:20 ` 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=20200319090537.5613-2-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v13 01/11] box: recovery_journal_create -- set journal here' \ /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